summaryrefslogtreecommitdiff
path: root/spec/javascripts/fixtures
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-06-21 01:36:08 -0500
committerEric Eastwood <contact@ericeastwood.com>2017-06-21 10:16:06 -0500
commit5145e39ef7efe7618a2f78a63e13bc630be251a9 (patch)
tree69335349a48f63c5f8a4a762d857839c1f3735eb /spec/javascripts/fixtures
parent1e42253c6dd28f64d7a0f4227c60426c71db62bd (diff)
downloadgitlab-ce-5145e39ef7efe7618a2f78a63e13bc630be251a9.tar.gz
Fix linking to line number on parallel diff creating empty discussion34010-fix-linking-to-parallel-diff-line-number-creating-gray-box
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34010
Diffstat (limited to 'spec/javascripts/fixtures')
-rw-r--r--spec/javascripts/fixtures/merge_requests.rb13
1 files changed, 10 insertions, 3 deletions
diff --git a/spec/javascripts/fixtures/merge_requests.rb b/spec/javascripts/fixtures/merge_requests.rb
index 0715f4d5f6b..daaddd8f390 100644
--- a/spec/javascripts/fixtures/merge_requests.rb
+++ b/spec/javascripts/fixtures/merge_requests.rb
@@ -55,20 +55,27 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
render_merge_request(example.description, merge_request)
end
- it 'merge_requests/changes_tab_with_comments.json' do |example|
+ it 'merge_requests/inline_changes_tab_with_comments.json' do |example|
create(:diff_note_on_merge_request, project: project, author: admin, position: position, noteable: merge_request)
create(:note_on_merge_request, author: admin, project: project, noteable: merge_request)
render_merge_request(example.description, merge_request, action: :diffs, format: :json)
end
+ it 'merge_requests/parallel_changes_tab_with_comments.json' do |example|
+ create(:diff_note_on_merge_request, project: project, author: admin, position: position, noteable: merge_request)
+ create(:note_on_merge_request, author: admin, project: project, noteable: merge_request)
+ render_merge_request(example.description, merge_request, action: :diffs, format: :json, view: 'parallel')
+ end
+
private
- def render_merge_request(fixture_file_name, merge_request, action: :show, format: :html)
+ def render_merge_request(fixture_file_name, merge_request, action: :show, format: :html, view: 'inline')
get action,
namespace_id: project.namespace.to_param,
project_id: project,
id: merge_request.to_param,
- format: format
+ format: format,
+ view: view
expect(response).to be_success
store_frontend_fixture(response, fixture_file_name)