diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-02-07 13:05:52 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-07 13:05:52 +0000 |
| commit | 5fc522ed4fabaedb67e010706336868fb2095122 (patch) | |
| tree | 34abc6ad10b2573569650d28fbf4676dbd402da9 | |
| parent | 05033177d7349b5301ac9898a5acd0184b009f55 (diff) | |
| parent | c48dbcf0c0b43886a252d95ad649a157b35135b6 (diff) | |
| download | gitlab-ce-5fc522ed4fabaedb67e010706336868fb2095122.tar.gz | |
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
| -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 }") |