diff options
Diffstat (limited to 'spec/requests/api/merge_requests_spec.rb')
-rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 09177dd1710..37cb8fb7ee5 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -2151,6 +2151,23 @@ RSpec.describe API::MergeRequests do let(:entity) { merge_request } end + context 'when only assignee_ids are provided' do + let(:params) do + { + assignee_ids: [user2.id] + } + end + + it 'sets the assignees' do + put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user), params: params + + expect(response).to have_gitlab_http_status(:ok) + expect(json_response['assignees']).to contain_exactly( + a_hash_including('name' => user2.name) + ) + end + end + context 'accepts reviewer_ids' do let(:params) do { @@ -2533,7 +2550,7 @@ RSpec.describe API::MergeRequests do it "results in a default squash commit message when not set" do put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user), params: { squash: true } - expect(squash_commit.message).to eq(merge_request.default_squash_commit_message) + expect(squash_commit.message.chomp).to eq(merge_request.default_squash_commit_message.chomp) end end |