Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/frontend/fixtures/api_merge_requests.rb')
-rw-r--r--spec/frontend/fixtures/api_merge_requests.rb19
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