diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-05-17 14:58:47 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-05-17 23:30:13 -0500 |
| commit | 027ad1381e509236b789c58ee7b3d057dd5517b5 (patch) | |
| tree | 8f5e75ae051fc1ff7f7eeba3802f0fe4d6dc6d9d /spec | |
| parent | 319cab4115380d3bff1e6543b759e785aa36a666 (diff) | |
| download | gitlab-ce-027ad1381e509236b789c58ee7b3d057dd5517b5.tar.gz | |
Fix linking to unresolved/expanded diff note32424-fix-linking-to-unresolved-expanded-diff-note
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32424
Bug introduced in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11327
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/features/merge_requests/diffs_spec.rb | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/spec/features/merge_requests/diffs_spec.rb b/spec/features/merge_requests/diffs_spec.rb index 7dee3b852ca..4860a2a7498 100644 --- a/spec/features/merge_requests/diffs_spec.rb +++ b/spec/features/merge_requests/diffs_spec.rb @@ -20,6 +20,34 @@ feature 'Diffs URL', js: true, feature: true do end end + context 'when linking to note' do + describe 'with unresolved note' do + let(:note) { create :diff_note_on_merge_request, project: project, noteable: merge_request } + let(:fragment) { "#note_#{note.id}" } + + before do + visit "#{diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)}#{fragment}" + end + + it 'shows expanded note' do + expect(page).to have_selector(fragment, visible: true) + end + end + + describe 'with resolved note' do + let(:note) { create :diff_note_on_merge_request, :resolved, project: project, noteable: merge_request } + let(:fragment) { "#note_#{note.id}" } + + before do + visit "#{diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)}#{fragment}" + end + + it 'shows expanded note' do + expect(page).to have_selector(fragment, visible: true) + end + end + end + context 'when merge request has overflow' do it 'displays warning' do allow(Commit).to receive(:max_diff_options).and_return(max_files: 3) |
