diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-14 11:41:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-14 11:41:52 +0300 |
commit | 585826cb22ecea5998a2c2a4675735c94bdeedac (patch) | |
tree | 5b05f0b30d33cef48963609e8a18a4dff260eab3 /spec/requests/api/graphql/mutations/merge_requests | |
parent | df221d036e5d0c6c0ee4d55b9c97f481ee05dee8 (diff) |
Add latest changes from gitlab-org/gitlab@16-6-stable-eev16.6.0-rc42
Diffstat (limited to 'spec/requests/api/graphql/mutations/merge_requests')
9 files changed, 107 insertions, 75 deletions
diff --git a/spec/requests/api/graphql/mutations/merge_requests/reviewer_rereview_spec.rb b/spec/requests/api/graphql/mutations/merge_requests/reviewer_rereview_spec.rb index 7a1b3982111..ec82941b094 100644 --- a/spec/requests/api/graphql/mutations/merge_requests/reviewer_rereview_spec.rb +++ b/spec/requests/api/graphql/mutations/merge_requests/reviewer_rereview_spec.rb @@ -16,11 +16,13 @@ RSpec.describe 'Setting assignees of a merge request', feature_category: :code_r project_path: project.full_path, iid: merge_request.iid.to_s } - graphql_mutation(:merge_request_reviewer_rereview, variables.merge(input), - <<-QL.strip_heredoc - clientMutationId - errors - QL + graphql_mutation( + :merge_request_reviewer_rereview, + variables.merge(input), + <<-QL.strip_heredoc + clientMutationId + errors + QL ) end diff --git a/spec/requests/api/graphql/mutations/merge_requests/set_assignees_spec.rb b/spec/requests/api/graphql/mutations/merge_requests/set_assignees_spec.rb index 4a7d1083f2e..cb7bac771b3 100644 --- a/spec/requests/api/graphql/mutations/merge_requests/set_assignees_spec.rb +++ b/spec/requests/api/graphql/mutations/merge_requests/set_assignees_spec.rb @@ -21,19 +21,21 @@ RSpec.describe 'Setting assignees of a merge request', :assume_throttled, featur project_path: project.full_path, iid: merge_request.iid.to_s } - graphql_mutation(:merge_request_set_assignees, variables.merge(input), - <<-QL.strip_heredoc - clientMutationId - errors - mergeRequest { - id - assignees { - nodes { - username - } - } - } - QL + graphql_mutation( + :merge_request_set_assignees, + variables.merge(input), + <<-QL.strip_heredoc + clientMutationId + errors + mergeRequest { + id + assignees { + nodes { + username + } + } + } + QL ) end diff --git a/spec/requests/api/graphql/mutations/merge_requests/set_draft_spec.rb b/spec/requests/api/graphql/mutations/merge_requests/set_draft_spec.rb index 0c2e2975350..a2c5c235d25 100644 --- a/spec/requests/api/graphql/mutations/merge_requests/set_draft_spec.rb +++ b/spec/requests/api/graphql/mutations/merge_requests/set_draft_spec.rb @@ -15,15 +15,17 @@ RSpec.describe 'Setting Draft status of a merge request', feature_category: :cod project_path: project.full_path, iid: merge_request.iid.to_s } - graphql_mutation(:merge_request_set_draft, variables.merge(input), - <<-QL.strip_heredoc - clientMutationId - errors - mergeRequest { - id - title - } - QL + graphql_mutation( + :merge_request_set_draft, + variables.merge(input), + <<-QL.strip_heredoc + clientMutationId + errors + mergeRequest { + id + title + } + QL ) end diff --git a/spec/requests/api/graphql/mutations/merge_requests/set_labels_spec.rb b/spec/requests/api/graphql/mutations/merge_requests/set_labels_spec.rb index e40a3cf7ce9..4ddd10b1734 100644 --- a/spec/requests/api/graphql/mutations/merge_requests/set_labels_spec.rb +++ b/spec/requests/api/graphql/mutations/merge_requests/set_labels_spec.rb @@ -17,19 +17,21 @@ RSpec.describe 'Setting labels of a merge request' do project_path: project.full_path, iid: merge_request.iid.to_s } - graphql_mutation(:merge_request_set_labels, variables.merge(input), - <<-QL.strip_heredoc - clientMutationId - errors - mergeRequest { - id - labels { - nodes { - id - } - } - } - QL + graphql_mutation( + :merge_request_set_labels, + variables.merge(input), + <<-QL.strip_heredoc + clientMutationId + errors + mergeRequest { + id + labels { + nodes { + id + } + } + } + QL ) end diff --git a/spec/requests/api/graphql/mutations/merge_requests/set_locked_spec.rb b/spec/requests/api/graphql/mutations/merge_requests/set_locked_spec.rb index 73a38adf723..a6ddb9beb5c 100644 --- a/spec/requests/api/graphql/mutations/merge_requests/set_locked_spec.rb +++ b/spec/requests/api/graphql/mutations/merge_requests/set_locked_spec.rb @@ -15,15 +15,17 @@ RSpec.describe 'Setting locked status of a merge request', feature_category: :co project_path: project.full_path, iid: merge_request.iid.to_s } - graphql_mutation(:merge_request_set_locked, variables.merge(input), - <<-QL.strip_heredoc - clientMutationId - errors - mergeRequest { - id - discussionLocked - } - QL + graphql_mutation( + :merge_request_set_locked, + variables.merge(input), + <<-QL.strip_heredoc + clientMutationId + errors + mergeRequest { + id + discussionLocked + } + QL ) end diff --git a/spec/requests/api/graphql/mutations/merge_requests/set_milestone_spec.rb b/spec/requests/api/graphql/mutations/merge_requests/set_milestone_spec.rb index 1898ee5a62d..9debfbd474b 100644 --- a/spec/requests/api/graphql/mutations/merge_requests/set_milestone_spec.rb +++ b/spec/requests/api/graphql/mutations/merge_requests/set_milestone_spec.rb @@ -16,17 +16,19 @@ RSpec.describe 'Setting milestone of a merge request', feature_category: :code_r project_path: project.full_path, iid: merge_request.iid.to_s } - graphql_mutation(:merge_request_set_milestone, variables.merge(input), - <<-QL.strip_heredoc - clientMutationId - errors - mergeRequest { - id - milestone { - id - } - } - QL + graphql_mutation( + :merge_request_set_milestone, + variables.merge(input), + <<-QL.strip_heredoc + clientMutationId + errors + mergeRequest { + id + milestone { + id + } + } + QL ) end diff --git a/spec/requests/api/graphql/mutations/merge_requests/set_reviewers_spec.rb b/spec/requests/api/graphql/mutations/merge_requests/set_reviewers_spec.rb index fd87112be33..c9efba689c2 100644 --- a/spec/requests/api/graphql/mutations/merge_requests/set_reviewers_spec.rb +++ b/spec/requests/api/graphql/mutations/merge_requests/set_reviewers_spec.rb @@ -21,19 +21,21 @@ RSpec.describe 'Setting reviewers of a merge request', :assume_throttled, featur project_path: project.full_path, iid: merge_request.iid.to_s } - graphql_mutation(:merge_request_set_reviewers, variables.merge(input), - <<-QL.strip_heredoc - clientMutationId - errors - mergeRequest { - id - reviewers { - nodes { - username - } - } - } - QL + graphql_mutation( + :merge_request_set_reviewers, + variables.merge(input), + <<-QL.strip_heredoc + clientMutationId + errors + mergeRequest { + id + reviewers { + nodes { + username + } + } + } + QL ) end diff --git a/spec/requests/api/graphql/mutations/merge_requests/set_time_estimate_spec.rb b/spec/requests/api/graphql/mutations/merge_requests/set_time_estimate_spec.rb index 6bc130a97cf..541cdf0660d 100644 --- a/spec/requests/api/graphql/mutations/merge_requests/set_time_estimate_spec.rb +++ b/spec/requests/api/graphql/mutations/merge_requests/set_time_estimate_spec.rb @@ -17,8 +17,11 @@ RSpec.describe 'Setting time estimate of a merge request', feature_category: :co let(:extra_params) { { project_path: project.full_path } } let(:input_params) { input.merge(extra_params) } - let(:mutation) { graphql_mutation(:merge_request_update, input_params, nil, ['productAnalyticsState']) } let(:mutation_response) { graphql_mutation_response(:merge_request_update) } + let(:mutation) do + # exclude codequalityReportsComparer because it's behind a feature flag + graphql_mutation(:merge_request_update, input_params, nil, %w[productAnalyticsState codequalityReportsComparer]) + end context 'when the user is not allowed to update a merge request' do before_all do diff --git a/spec/requests/api/graphql/mutations/merge_requests/update_spec.rb b/spec/requests/api/graphql/mutations/merge_requests/update_spec.rb index 48db23569b6..ef21f77d818 100644 --- a/spec/requests/api/graphql/mutations/merge_requests/update_spec.rb +++ b/spec/requests/api/graphql/mutations/merge_requests/update_spec.rb @@ -12,8 +12,11 @@ RSpec.describe 'Update of an existing merge request', feature_category: :code_re let(:input) { { 'iid' => merge_request.iid.to_s } } let(:extra_params) { { project_path: project.full_path } } let(:input_params) { input.merge(extra_params) } - let(:mutation) { graphql_mutation(:merge_request_update, input_params, nil, ['productAnalyticsState']) } let(:mutation_response) { graphql_mutation_response(:merge_request_update) } + let(:mutation) do + # exclude codequalityReportsComparer because it's behind a feature flag + graphql_mutation(:merge_request_update, input_params, nil, %w[productAnalyticsState codequalityReportsComparer]) + end context 'when the user is not allowed to update the merge request' do it_behaves_like 'a mutation that returns a top-level access error' @@ -28,5 +31,17 @@ RSpec.describe 'Update of an existing merge request', feature_category: :code_re let(:resource) { merge_request } let(:mutation_name) { 'mergeRequestUpdate' } end + + context 'when required arguments are missing' do + let(:input_params) { {} } + + it_behaves_like 'a mutation that returns top-level errors' do + let(:match_errors) do + include(end_with( + 'invalid value for projectPath (Expected value to not be null), iid (Expected value to not be null)' + )) + end + end + end end end |