Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 1 deletions

diff --git a/spec/graphql/types/merge_request_type_spec.rb b/spec/graphql/types/merge_request_type_spec.rb
index 6904c2dcd07..04e9bb6861f 100644
--- a/spec/graphql/types/merge_request_type_spec.rb
+++ b/spec/graphql/types/merge_request_type_spec.rb
@@ -20,7 +20,9 @@ describe GitlabSchema.types['MergeRequest'] do
       merge_error allow_collaboration should_be_rebased rebase_commit_sha
       rebase_in_progress merge_commit_message default_merge_commit_message
       merge_ongoing source_branch_exists mergeable_discussions_state web_url
-      upvotes downvotes subscribed head_pipeline pipelines task_completion_status
+      upvotes downvotes head_pipeline pipelines task_completion_status
+      milestone assignees participants subscribed labels discussion_locked time_estimate
+      total_time_spent reference
     ]
 
     is_expected.to have_graphql_fields(*expected_fields)
diff --git a/spec/graphql/types/project_type_spec.rb b/spec/graphql/types/project_type_spec.rb
index f632b904e78..cfd0f8ec7a7 100644
--- a/spec/graphql/types/project_type_spec.rb
+++ b/spec/graphql/types/project_type_spec.rb
@@ -45,4 +45,22 @@ describe GitlabSchema.types['Project'] do
       is_expected.to have_graphql_resolver(Resolvers::IssuesResolver)
     end
   end
+
+  describe 'merge_requests field' do
+    subject { described_class.fields['mergeRequest'] }
+
+    it 'returns merge requests' do
+      is_expected.to have_graphql_type(Types::MergeRequestType)
+      is_expected.to have_graphql_resolver(Resolvers::MergeRequestsResolver.single)
+    end
+  end
+
+  describe 'merge_request field' do
+    subject { described_class.fields['mergeRequests'] }
+
+    it 'returns merge request' do
+      is_expected.to have_graphql_type(Types::MergeRequestType.connection_type)
+      is_expected.to have_graphql_resolver(Resolvers::MergeRequestsResolver)
+    end
+  end
 end