Fix failed test because of a copy change.

2016-08-11 20:54:55 +03:00 · 2016-08-11 20:54:55 +03:00 · f6aa91700a
parent 66241c1b08
commit f6aa91700a
1 changed files with 1 additions and 1 deletions
--- a/spec/features/merge_requests/conflicts_spec.rb
+++ b/spec/features/merge_requests/conflicts_spec.rb
@ -61,7 +61,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do
        visit current_url + '/conflicts'
        wait_for_ajax

-        expect(find('#conflicts')).to have_content('Unable to resolve conflicts')
+        expect(find('#conflicts')).to have_content('Please try to resolve them locally.')
      end
    end
  end