diff options
| author | Phil Hughes <me@iamphill.com> | 2019-02-07 11:36:43 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-02-07 11:36:43 +0000 |
| commit | c48dbcf0c0b43886a252d95ad649a157b35135b6 (patch) | |
| tree | f958f50adca5a2d78cf7659508c8d57f669283ee | |
| parent | 42956f21bad619e5b906565867a749469accb853 (diff) | |
| download | gitlab-ce-c48dbcf0c0b43886a252d95ad649a157b35135b6.tar.gz | |
Update spec/features/merge_request/user_resolves_conflicts_spec.rb
| -rw-r--r-- | spec/features/merge_request/user_resolves_conflicts_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
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 }") |