Simplify AuthenticationOption factories [ui skip]

Author: islemaster

dashboard/test/factories/factories.rb

@@ -492,32 +492,16 @@
 
   factory :authentication_option do
     association :user
-    email {''}
-    hashed_email {''}
-    credential_type {AuthenticationOption::EMAIL}
-    authentication_id {''}
-
-    factory :email_authentication_option do
-      sequence(:email) {|n| "testuser#{n}@example.com.xx"}
-      after(:create) do |auth|
-        auth.authentication_id = auth.hashed_email
-      end
-    end
+    sequence(:email) {|n| "testuser#{n}@example.com.xx"}
+    credential_type AuthenticationOption::EMAIL
+    authentication_id {User.hash_email email}
 
     factory :google_authentication_option do
       credential_type AuthenticationOption::GOOGLE
-      sequence(:email) {|n| "testuser#{n}@example.com.xx"}
-      after(:create) do |auth|
-        auth.authentication_id = auth.hashed_email
-      end
     end
 
     factory :facebook_authentication_option do
       credential_type AuthenticationOption::FACEBOOK
-      sequence(:email) {|n| "testuser#{n}@example.com.xx"}
-      after(:create) do |auth|
-        auth.authentication_id = auth.hashed_email
-      end
     end
   end
 

dashboard/test/models/authentication_option_test.rb

@@ -17,7 +17,7 @@ class AuthenticationOptionTest < ActiveSupport::TestCase
     original_teacher_email = '[email protected]'
     new_teacher_email = '[email protected]'
     teacher = create(:teacher, email: original_teacher_email)
-    email_auth = create(:email_authentication_option, user: teacher, email: new_teacher_email)
+    email_auth = create(:authentication_option, user: teacher, email: new_teacher_email)
     teacher.update(primary_contact_info: email_auth, provider: 'migrated')
     assert_equal teacher.primary_contact_info_id, email_auth.id
     assert_equal new_teacher_email, teacher.email
@@ -28,15 +28,15 @@ class AuthenticationOptionTest < ActiveSupport::TestCase
     teacher_email = '[email protected]'
     sanitized = '[email protected]'
     teacher = create(:teacher, email: teacher_email)
-    email_auth = create(:email_authentication_option, user: teacher, email: teacher_email)
+    email_auth = create(:authentication_option, user: teacher, email: teacher_email)
     assert_equal sanitized, email_auth.email
     assert_equal email_auth.hashed_email, AuthenticationOption.hash_email(sanitized)
   end
 
   test 'student email is not stored but hashed_email is' do
     student_email = '[email protected]'
     student = create(:student, email: student_email)
-    email_auth = create(:email_authentication_option, user: student, email: student_email)
+    email_auth = create(:authentication_option, user: student, email: student_email)
     assert email_auth.user.student?
     assert_equal '', email_auth.email
     assert_equal student.hashed_email, email_auth.hashed_email
@@ -155,4 +155,59 @@ class AuthenticationOptionTest < ActiveSupport::TestCase
     }
     assert_equal new_data, auth_option.data_hash
   end
+
+  test "factory: :authentication_option" do
+    option = create :authentication_option
+    assert option.valid?
+    assert option.persisted?
+    assert_equal AuthenticationOption::EMAIL, option.credential_type
+
+    # Default user is a student so email is empty
+    assert option.user.student?
+    assert_empty option.email
+
+    refute_empty option.hashed_email
+    assert_equal option.hashed_email, option.authentication_id
+  end
+
+  test "factory: :authentication_option for teacher" do
+    option = create :authentication_option, user: create(:teacher)
+    assert option.valid?
+    assert option.persisted?
+    assert_equal AuthenticationOption::EMAIL, option.credential_type
+
+    assert option.user.teacher?
+    refute_empty option.email
+
+    refute_empty option.hashed_email
+    assert_equal option.hashed_email, option.authentication_id
+  end
+
+  test "factory: :google_authentication_option" do
+    option = create :google_authentication_option
+    assert option.valid?
+    assert option.persisted?
+    assert_equal AuthenticationOption::GOOGLE, option.credential_type
+
+    # Default user is a student so email is empty
+    assert option.user.student?
+    assert_empty option.email
+
+    refute_empty option.hashed_email
+    refute_empty option.authentication_id
+  end
+
+  test "factory: :facebook_authentication_option" do
+    option = create :facebook_authentication_option
+    assert option.valid?
+    assert option.persisted?
+    assert_equal AuthenticationOption::FACEBOOK, option.credential_type
+
+    # Default user is a student so email is empty
+    assert option.user.student?
+    assert_empty option.email
+
+    refute_empty option.hashed_email
+    refute_empty option.authentication_id
+  end
 end

dashboard/test/models/user_test.rb

@@ -3815,7 +3815,7 @@ def hide_scripts_in_sections(section1, section2)
 
   test 'find_by_email locates a multi-auth teacher by non-primary email' do
     teacher = create :teacher, :with_migrated_email_authentication_option
-    second_option = create :email_authentication_option, user: teacher
+    second_option = create :authentication_option, user: teacher
     assert_equal teacher, User.find_by_email(second_option.email)
   end