Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 32 insertions, 2 deletions

diff --git a/spec/graphql/types/project_type_spec.rb b/spec/graphql/types/project_type_spec.rb
index 6368f743720..8ee9aa9cf3a 100644
--- a/spec/graphql/types/project_type_spec.rb
+++ b/spec/graphql/types/project_type_spec.rb
@@ -26,6 +26,7 @@ describe GitlabSchema.types['Project'] do
       grafanaIntegration autocloseReferencedIssues suggestion_commit_message environments
       boards jira_import_status jira_imports services releases release
       alert_management_alerts alert_management_alert alert_management_alert_status_counts
+      container_expiration_policy
     ]
 
     expect(described_class).to include_graphql_fields(*expected_fields)
@@ -45,18 +46,32 @@ describe GitlabSchema.types['Project'] do
     it { is_expected.to have_graphql_resolver(Resolvers::IssuesResolver) }
   end
 
-  describe 'merge_requests field' do
+  describe 'merge_request field' do
     subject { described_class.fields['mergeRequest'] }
 
     it { is_expected.to have_graphql_type(Types::MergeRequestType) }
     it { is_expected.to have_graphql_resolver(Resolvers::MergeRequestsResolver.single) }
+    it { is_expected.to have_graphql_arguments(:iid) }
   end
 
-  describe 'merge_request field' do
+  describe 'merge_requests field' do
     subject { described_class.fields['mergeRequests'] }
 
     it { is_expected.to have_graphql_type(Types::MergeRequestType.connection_type) }
     it { is_expected.to have_graphql_resolver(Resolvers::MergeRequestsResolver) }
+
+    it do
+      is_expected.to have_graphql_arguments(:iids,
+                                            :source_branches,
+                                            :target_branches,
+                                            :state,
+                                            :labels,
+                                            :before,
+                                            :after,
+                                            :first,
+                                            :last
+                                           )
+    end
   end
 
   describe 'snippets field' do
@@ -80,6 +95,13 @@ describe GitlabSchema.types['Project'] do
     it { is_expected.to have_graphql_resolver(Resolvers::EnvironmentsResolver) }
   end
 
+  describe 'members field' do
+    subject { described_class.fields['projectMembers'] }
+
+    it { is_expected.to have_graphql_type(Types::ProjectMemberType.connection_type) }
+    it { is_expected.to have_graphql_resolver(Resolvers::ProjectMembersResolver) }
+  end
+
   describe 'boards field' do
     subject { described_class.fields['boards'] }
 
@@ -111,4 +133,12 @@ describe GitlabSchema.types['Project'] do
     it { is_expected.to have_graphql_type(Types::ReleaseType.connection_type) }
     it { is_expected.to have_graphql_resolver(Resolvers::ReleasesResolver) }
   end
+
+  describe 'container expiration policy field' do
+    subject { described_class.fields['containerExpirationPolicy'] }
+
+    it { is_expected.to have_graphql_type(Types::ContainerExpirationPolicyType) }
+  end
+
+  it_behaves_like 'a GraphQL type with labels'
 end