diff options
Diffstat (limited to 'spec/frontend/fixtures/merge_requests_diffs.rb')
-rw-r--r-- | spec/frontend/fixtures/merge_requests_diffs.rb | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/spec/frontend/fixtures/merge_requests_diffs.rb b/spec/frontend/fixtures/merge_requests_diffs.rb index 5ad4176f7b8..edf1fcf3c0a 100644 --- a/spec/frontend/fixtures/merge_requests_diffs.rb +++ b/spec/frontend/fixtures/merge_requests_diffs.rb @@ -25,6 +25,10 @@ RSpec.describe Projects::MergeRequests::DiffsController, '(JavaScript fixtures)' end before do + # Create a user that matches the project.commit author + # This is so that the "author" information will be populated + create(:user, email: project.commit.author_email, name: project.commit.author_name) + sign_in(user) end @@ -33,17 +37,21 @@ RSpec.describe Projects::MergeRequests::DiffsController, '(JavaScript fixtures)' end it 'merge_request_diffs/with_commit.json' do - # Create a user that matches the project.commit author - # This is so that the "author" information will be populated - create(:user, email: project.commit.author_email, name: project.commit.author_name) - render_merge_request(merge_request, commit_id: project.commit.sha) end + it 'merge_request_diffs/diffs_metadata.json' do + render_merge_request(merge_request, action: :diffs_metadata) + end + + it 'merge_request_diffs/diffs_batch.json' do + render_merge_request(merge_request, action: :diffs_batch, page: 1, per_page: 30) + end + private - def render_merge_request(merge_request, view: 'inline', **extra_params) - get :show, params: { + def render_merge_request(merge_request, action: :show, view: 'inline', **extra_params) + get action, params: { namespace_id: project.namespace.to_param, project_id: project, id: merge_request.to_param, |