From 366ebe8b13ec0b92cfef7a2317b6003577e323bf Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Fri, 1 Sep 2017 15:50:42 -0400 Subject: Fix failures introduced by Capybara upgrade --- spec/features/merge_requests/diff_notes_resolve_spec.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'spec/features/merge_requests/diff_notes_resolve_spec.rb') diff --git a/spec/features/merge_requests/diff_notes_resolve_spec.rb b/spec/features/merge_requests/diff_notes_resolve_spec.rb index ac7f75bd308..fd110e68e84 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 -- cgit v1.2.1