Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 20 insertions, 1 deletions

diff --git a/spec/graphql/types/user_type_spec.rb b/spec/graphql/types/user_type_spec.rb
index dcf25ff0667..45cb960cf20 100644
--- a/spec/graphql/types/user_type_spec.rb
+++ b/spec/graphql/types/user_type_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe GitlabSchema.types['User'] do
+RSpec.describe GitlabSchema.types['User'], feature_category: :users do
   specify { expect(described_class.graphql_name).to eq('User') }
 
   specify do
@@ -20,7 +20,10 @@ RSpec.describe GitlabSchema.types['User'] do
       name
       username
       email
+      emails
       publicEmail
+      commitEmail
+      namespaceCommitEmails
       avatarUrl
       webUrl
       webPath
@@ -226,4 +229,20 @@ RSpec.describe GitlabSchema.types['User'] do
       is_expected.to have_graphql_type(Types::TimelogType.connection_type)
     end
   end
+
+  describe 'emails field' do
+    subject { described_class.fields['emails'] }
+
+    it 'returns user emails' do
+      is_expected.to have_graphql_type(Types::Users::EmailType.connection_type)
+    end
+  end
+
+  describe 'namespaceCommitEmails field' do
+    subject { described_class.fields['namespaceCommitEmails'] }
+
+    it 'returns user namespace_commit_emails' do
+      is_expected.to have_graphql_type(Types::Users::NamespaceCommitEmailType.connection_type)
+    end
+  end
 end