From c48dbcf0c0b43886a252d95ad649a157b35135b6 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Thu, 7 Feb 2019 11:36:43 +0000 Subject: Update spec/features/merge_request/user_resolves_conflicts_spec.rb --- spec/features/merge_request/user_resolves_conflicts_spec.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'spec/features') diff --git a/spec/features/merge_request/user_resolves_conflicts_spec.rb b/spec/features/merge_request/user_resolves_conflicts_spec.rb index 50c723776a3..16c058ab6bd 100644 --- a/spec/features/merge_request/user_resolves_conflicts_spec.rb +++ b/spec/features/merge_request/user_resolves_conflicts_spec.rb @@ -37,6 +37,8 @@ describe 'Merge request > User resolves conflicts', :js do click_on 'Changes' wait_for_requests + find('.js-toggle-tree-list').click + 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: "options = { chdir: path }") -- cgit v1.2.1