diff options
Diffstat (limited to 'spec/requests/api/merge_requests_spec.rb')
| -rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 87 |
1 files changed, 58 insertions, 29 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 9d153286d14..d593e369d27 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -119,10 +119,13 @@ RSpec.describe API::MergeRequests do it 'returns an array of all merge_requests' do get api(endpoint_path, user) - expect_paginated_array_response([ - merge_request_merged.id, merge_request_locked.id, - merge_request_closed.id, merge_request.id - ]) + expect_paginated_array_response( + [ + merge_request_merged.id, + merge_request_locked.id, + merge_request_closed.id, + merge_request.id + ]) expect(json_response.last['title']).to eq(merge_request.title) expect(json_response.last).to have_key('web_url') @@ -172,10 +175,13 @@ RSpec.describe API::MergeRequests do get api(path, user) - expect_paginated_array_response([ - merge_request_merged.id, merge_request_locked.id, - merge_request_closed.id, merge_request.id - ]) + expect_paginated_array_response( + [ + merge_request_merged.id, + merge_request_locked.id, + merge_request_closed.id, + merge_request.id + ]) expect(json_response.last.keys).to match_array(%w(id iid title web_url created_at description project_id state updated_at)) expect(json_response.last['iid']).to eq(merge_request.iid) expect(json_response.last['title']).to eq(merge_request.title) @@ -190,10 +196,13 @@ RSpec.describe API::MergeRequests do get api(path, user) - expect_paginated_array_response([ - merge_request_merged.id, merge_request_locked.id, - merge_request_closed.id, merge_request.id - ]) + expect_paginated_array_response( + [ + merge_request_merged.id, + merge_request_locked.id, + merge_request_closed.id, + merge_request.id + ]) expect(json_response.last['title']).to eq(merge_request.title) end @@ -354,10 +363,13 @@ RSpec.describe API::MergeRequests do get api(path, user) - expect_paginated_array_response([ - merge_request.id, merge_request_closed.id, - merge_request_locked.id, merge_request_merged.id - ]) + expect_paginated_array_response( + [ + merge_request.id, + merge_request_closed.id, + merge_request_locked.id, + merge_request_merged.id + ]) response_dates = json_response.map { |merge_request| merge_request['created_at'] } expect(response_dates).to eq(response_dates.sort) end @@ -367,10 +379,13 @@ RSpec.describe API::MergeRequests do get api(path, user) - expect_paginated_array_response([ - merge_request_merged.id, merge_request_locked.id, - merge_request_closed.id, merge_request.id - ]) + expect_paginated_array_response( + [ + merge_request_merged.id, + merge_request_locked.id, + merge_request_closed.id, + merge_request.id + ]) response_dates = json_response.map { |merge_request| merge_request['created_at'] } expect(response_dates).to eq(response_dates.sort.reverse) end @@ -398,10 +413,13 @@ RSpec.describe API::MergeRequests do get api(path, user) - expect_paginated_array_response([ - merge_request.id, merge_request_locked.id, - merge_request_merged.id, merge_request_closed.id - ]) + expect_paginated_array_response( + [ + merge_request.id, + merge_request_locked.id, + merge_request_merged.id, + merge_request_closed.id + ]) response_dates = json_response.map { |merge_request| merge_request['updated_at'] } expect(response_dates).to eq(response_dates.sort.reverse) end @@ -411,10 +429,13 @@ RSpec.describe API::MergeRequests do get api(path, user) - expect_paginated_array_response([ - merge_request.id, merge_request_closed.id, - merge_request_locked.id, merge_request_merged.id - ]) + expect_paginated_array_response( + [ + merge_request.id, + merge_request_closed.id, + merge_request_locked.id, + merge_request_merged.id + ]) response_dates = json_response.map { |merge_request| merge_request['created_at'] } expect(response_dates).to eq(response_dates.sort) end @@ -1023,6 +1044,14 @@ RSpec.describe API::MergeRequests do it_behaves_like 'a non-cached MergeRequest api request', 1 end + context 'when the label changes' do + before do + merge_request.labels << create(:label, project: merge_request.project) + end + + it_behaves_like 'a non-cached MergeRequest api request', 1 + end + context 'when the assignees change' do before do merge_request.assignees << create(:user) @@ -3315,7 +3344,7 @@ RSpec.describe API::MergeRequests do end it 'handles external issues' do - jira_project = create(:jira_project, :public, :repository, name: 'JIR_EXT1') + jira_project = create(:project, :with_jira_integration, :public, :repository, name: 'JIR_EXT1') ext_issue = ExternalIssue.new("#{jira_project.name}-123", jira_project) issue = create(:issue, project: jira_project) description = "Closes #{ext_issue.to_reference(jira_project)}\ncloses #{issue.to_reference}" |