diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-13 12:21:33 -0500 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-13 12:21:33 -0500 |
| commit | 4c0beb6c024b25ff24c7c2ea966bacab0ee860d5 (patch) | |
| tree | f3e61556a1cc9132f439d222dca9d6366eb8a6ca /spec/features/merge_requests/diff_notes_resolve_spec.rb | |
| parent | 2d58626a33bc0d4e78eaf0c25965d18a6239fa3b (diff) | |
| parent | 33010da28b0f2e00e96cc4bf6c439363905a81d5 (diff) | |
| download | gitlab-ce-4c0beb6c024b25ff24c7c2ea966bacab0ee860d5.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'spec/features/merge_requests/diff_notes_resolve_spec.rb')
| -rw-r--r-- | spec/features/merge_requests/diff_notes_resolve_spec.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/features/merge_requests/diff_notes_resolve_spec.rb b/spec/features/merge_requests/diff_notes_resolve_spec.rb index 5019ed43496..27115bf8d14 100644 --- a/spec/features/merge_requests/diff_notes_resolve_spec.rb +++ b/spec/features/merge_requests/diff_notes_resolve_spec.rb @@ -196,10 +196,11 @@ feature 'Diff notes resolve', js: true do end it 'does not mark discussion as resolved when resolving single note' do - page.first '.diff-content .note' do + page.within("#note_#{note.id}") do first('.line-resolve-btn').click - expect(page).to have_selector('.note-action-button .loading') + wait_for_requests + expect(first('.line-resolve-btn')['data-original-title']).to eq("Resolved by #{user.name}") end |