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

Fixed failing conflict resolve spec

Closes #9645

See merge request gitlab-org/gitlab-ee!9484

locale/gitlab.pot

@@ -44,16 +44,6 @@ msgstr ""
 msgid "\"%{query}\" in projects"
 msgstr ""
 
-msgid "%d addition"
-msgid_plural "%d additions"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "%d changed file"
-msgid_plural "%d changed files"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "%d commit"
 msgid_plural "%d commits"
 msgstr[0] ""

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 }")