Merge branch 'generalize-profile-updates' into 'master'

Profile updates from providers

See merge request !12968

1 files changed, 25 insertions, 6 deletions

diff --git a/spec/helpers/profiles_helper_spec.rb b/spec/helpers/profiles_helper_spec.rb
index b33b3f3a228..c1d0614c79e 100644
--- a/spec/helpers/profiles_helper_spec.rb
+++ b/spec/helpers/profiles_helper_spec.rb
@@ -6,22 +6,41 @@ describe ProfilesHelper do
       user = create(:user)
       allow(helper).to receive(:current_user).and_return(user)
 
-      expect(helper.email_provider_label).to be_nil
+      expect(helper.attribute_provider_label(:email)).to be_nil
     end
 
-    it "returns omniauth provider label for users with external email" do
+    it "returns omniauth provider label for users with external attributes" do
+      stub_omniauth_setting(sync_profile_from_provider: ['cas3'])
+      stub_omniauth_setting(sync_profile_attributes: true)
       stub_cas_omniauth_provider
-      cas_user = create(:omniauth_user, provider: 'cas3', external_email: true, email_provider: 'cas3')
+      cas_user = create(:omniauth_user, provider: 'cas3')
+      cas_user.create_user_synced_attributes_metadata(provider: 'cas3', name_synced: true, email_synced: true, location_synced: true)
       allow(helper).to receive(:current_user).and_return(cas_user)
 
-      expect(helper.email_provider_label).to eq('CAS')
+      expect(helper.attribute_provider_label(:email)).to eq('CAS')
+      expect(helper.attribute_provider_label(:name)).to eq('CAS')
+      expect(helper.attribute_provider_label(:location)).to eq('CAS')
+    end
+
+    it "returns the correct omniauth provider label for users with some external attributes" do
+      stub_omniauth_setting(sync_profile_from_provider: ['cas3'])
+      stub_omniauth_setting(sync_profile_attributes: true)
+      stub_cas_omniauth_provider
+      cas_user = create(:omniauth_user, provider: 'cas3')
+      cas_user.create_user_synced_attributes_metadata(provider: 'cas3', name_synced: false, email_synced: true, location_synced: false)
+      allow(helper).to receive(:current_user).and_return(cas_user)
+
+      expect(helper.attribute_provider_label(:name)).to be_nil
+      expect(helper.attribute_provider_label(:email)).to eq('CAS')
+      expect(helper.attribute_provider_label(:location)).to be_nil
     end
 
     it "returns 'LDAP' for users with external email but no email provider" do
-      ldap_user = create(:omniauth_user, external_email: true)
+      ldap_user = create(:omniauth_user)
+      ldap_user.create_user_synced_attributes_metadata(email_synced: true)
       allow(helper).to receive(:current_user).and_return(ldap_user)
 
-      expect(helper.email_provider_label).to eq('LDAP')
+      expect(helper.attribute_provider_label(:email)).to eq('LDAP')
     end
   end