Merge branch 'ce-6571-single-codebase' into 'master'

CE-port of 6571-single-codebase See merge request gitlab-org/gitlab-ce!26355

Merge branch 'ce-6571-single-codebase' into 'master'
CE-port of 6571-single-codebase See merge request gitlab-org/gitlab-ce!26355
2269710b · Rémy Coutable · 4ac99465 · f17875eb · 2269710b
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -497,12 +497,21 @@

        it 'allows user to unselect themselves', :js do
          issue2 = create(:issue, project: project, author: user)
+
          visit project_issue_path(project, issue2)

+          def close_dropdown_menu_if_visible
+            find('.dropdown-menu-toggle', visible: :all).tap do |toggle|
+              toggle.click if toggle.visible?
+            end
+          end
+
          page.within '.assignee' do
            click_link 'Edit'
            click_link user.name

+            close_dropdown_menu_if_visible
+
            page.within '.value .author' do
              expect(page).to have_content user.name
            end
@@ -510,6 +519,8 @@
            click_link 'Edit'
            click_link user.name

+            close_dropdown_menu_if_visible
+
            page.within '.value .assign-yourself' do
              expect(page).to have_content "No assignee"
            end