Fix failing conflicts test

465316ec · Annabel Dunstone Gray · bc6ad4f0 · 465316ec
Commit 465316ec authored Jan 24, 2017 by Annabel Dunstone Gray
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

spec/features/merge_requests/conflicts_spec.rb spec/features/merge_requests/conflicts_spec.rb +1 -1

No files found.
--- a/spec/features/merge_requests/conflicts_spec.rb
+++ b/spec/features/merge_requests/conflicts_spec.rb
@@ -141,7 +141,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do

        click_on 'Changes'
        wait_for_ajax
-        find('.click-to-expand').click
+        click_link 'Expand all'
        wait_for_ajax

        expect(page).to have_content('Gregor Samsa woke from troubled dreams')