diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /spec/frontend/fixtures/api_merge_requests.rb | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'spec/frontend/fixtures/api_merge_requests.rb')
-rw-r--r-- | spec/frontend/fixtures/api_merge_requests.rb | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/spec/frontend/fixtures/api_merge_requests.rb b/spec/frontend/fixtures/api_merge_requests.rb index f3280e216ff..7117c9a1c7a 100644 --- a/spec/frontend/fixtures/api_merge_requests.rb +++ b/spec/frontend/fixtures/api_merge_requests.rb @@ -6,9 +6,10 @@ RSpec.describe API::MergeRequests, '(JavaScript fixtures)', type: :request do include ApiHelpers include JavaScriptFixturesHelpers - let(:admin) { create(:admin, name: 'root') } - let(:namespace) { create(:namespace, name: 'gitlab-test' )} - let(:project) { create(:project, :repository, namespace: namespace, path: 'lorem-ipsum') } + let_it_be(:admin) { create(:admin, name: 'root') } + let_it_be(:namespace) { create(:namespace, name: 'gitlab-test' )} + let_it_be(:project) { create(:project, :repository, namespace: namespace, path: 'lorem-ipsum') } + let_it_be(:mr) { create(:merge_request, source_project: project) } before(:all) do clean_frontend_fixtures('api/merge_requests') @@ -21,4 +22,16 @@ RSpec.describe API::MergeRequests, '(JavaScript fixtures)', type: :request do expect(response).to be_successful end + + it 'api/merge_requests/versions.json' do + get api("/projects/#{project.id}/merge_requests/#{mr.iid}/versions", admin) + + expect(response).to be_successful + end + + it 'api/merge_requests/changes.json' do + get api("/projects/#{project.id}/merge_requests/#{mr.iid}/changes", admin) + + expect(response).to be_successful + end end |