fix tests

Author: hanneskt

app/models/user.rb

@@ -39,12 +39,10 @@ def self.from_omniauth(auth)
     db_user = find_by(zauth_id: auth.uid)
 
     if db_user.nil?
-      db_user = find_or_create_by!(name: auth.extra.raw_info["username"]) do |user|
+      db_user = find_or_create_by!(zauth_id: auth.uid) do |user|
         user.generate_key!
         user.private = true
       end
-
-      db_user.zauth_id = auth.uid
     end
 
     # overwrite name (for if name changed)

spec/factories/users.rb

@@ -26,6 +26,7 @@
 FactoryBot.define do
   factory :user do
     name { Faker::Internet.user_name }
+    zauth_id { Faker::String.random }
     private { false }
 
     factory :admin do

spec/models/user_spec.rb

@@ -88,7 +88,7 @@
       let(:auth_hash) do
         OmniAuth::AuthHash.new(
           {
-            uid: 7,
+            uid: "7",
             extra: {
               raw_info: { roles: [], username: existing_user.name }
             }
@@ -106,26 +106,6 @@
       end
     end
 
-    describe "when the user already exists but without zauth id" do
-      let!(:existing_user) { create(:user) }
-      let(:auth_hash) do
-        OmniAuth::AuthHash.new(
-          {
-            uid: "7",
-            extra: {
-              raw_info: { roles: [], username: existing_user.name }
-            }
-          }
-        )
-      end
-
-      it "finds the existing user" do
-        user = described_class.from_omniauth(auth_hash)
-        expect(user).to eq(existing_user)
-        expect(user.admin).to be(false)
-      end
-    end
-
     describe "when the user exists but has changed their name" do
       let!(:existing_user) { create(:user) }
       let(:auth_hash) do