diff options
author | Phil Hughes <me@iamphill.com> | 2017-05-18 14:13:37 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-05-18 14:13:37 +0000 |
commit | 4d2d2b11796fbf6f115b5e427794ec1c8126b2a0 (patch) | |
tree | f1a20d1ff96cc04d503afc94b5df9ee0d66f0971 /spec/features | |
parent | 4e410a6e5100d76529e66bb23c4496b14d24f4af (diff) | |
parent | 027ad1381e509236b789c58ee7b3d057dd5517b5 (diff) | |
download | gitlab-ce-4d2d2b11796fbf6f115b5e427794ec1c8126b2a0.tar.gz |
Merge branch '32424-fix-linking-to-unresolved-expanded-diff-note' into 'master'
Fix linking to unresolved/expanded diff note
Closes #32424
See merge request !11458
Diffstat (limited to 'spec/features')
-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) |