Commit 5fc522ed authored by Sean McGivern's avatar Sean McGivern

Merge branch 'ce-version-fix-failing-resolve-conflicts-spec' into 'master'

Update spec/features/merge_request/user_resolves_conflicts_spec.rb

See merge request gitlab-org/gitlab-ce!24996
parents 05033177 c48dbcf0
...@@ -37,6 +37,8 @@ describe 'Merge request > User resolves conflicts', :js do ...@@ -37,6 +37,8 @@ describe 'Merge request > User resolves conflicts', :js do
click_on 'Changes' click_on 'Changes'
wait_for_requests wait_for_requests
find('.js-toggle-tree-list').click
within find('.diff-file', text: 'files/ruby/popen.rb') do within find('.diff-file', text: 'files/ruby/popen.rb') do
expect(page).to have_selector('.line_content.new', text: "vars = { 'PWD' => path }") expect(page).to have_selector('.line_content.new', text: "vars = { 'PWD' => path }")
expect(page).to have_selector('.line_content.new', text: "options = { chdir: path }") expect(page).to have_selector('.line_content.new', text: "options = { chdir: path }")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment