Add latest changes from gitlab-org/gitlab@master

5 files changed, 9 insertions, 5 deletions

diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 4c688094352..7b3b966bd50 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -41,10 +41,10 @@ Capybara.register_driver :chrome do |app|
   # Run headless by default unless CHROME_HEADLESS specified
   options.add_argument("headless") unless ENV['CHROME_HEADLESS'] =~ /^(false|no|0)$/i
 
-  # Disable /dev/shm use in CI. See https://gitlab.com/gitlab-org/gitlab-ee/issues/4252
+  # Disable /dev/shm use in CI. See https://gitlab.com/gitlab-org/gitlab/issues/4252
   options.add_argument("disable-dev-shm-usage") if ENV['CI'] || ENV['CI_SERVER']
 
-  # Explicitly set user-data-dir to prevent crashes. See https://gitlab.com/gitlab-org/gitlab-ce/issues/58882#note_179811508
+  # Explicitly set user-data-dir to prevent crashes. See https://gitlab.com/gitlab-org/gitlab-foss/issues/58882#note_179811508
   options.add_argument("user-data-dir=/tmp/chrome") if ENV['CI'] || ENV['CI_SERVER']
 
   # Chrome 75 defaults to W3C mode which doesn't allow console log access
diff --git a/spec/support/gitlab-git-test.git/README.md b/spec/support/gitlab-git-test.git/README.md
index f757e613ee6..4e2cee766fa 100644
--- a/spec/support/gitlab-git-test.git/README.md
+++ b/spec/support/gitlab-git-test.git/README.md
@@ -7,7 +7,7 @@ inflate the size of the gitlab-ce repository.
 
 ## How to make changes to this repository
 
-- (if needed) clone `https://gitlab.com/gitlab-org/gitlab-ce.git` to your local machine
+- (if needed) clone `https://gitlab.com/gitlab-org/gitlab-foss.git` to your local machine
 - clone `gitlab-ce/spec/support/gitlab-git-test.git` locally (i.e. clone from your hard drive, not from the internet)
 - make changes in your local clone of gitlab-git-test
 - run `git push` which will push to your local source `gitlab-ce/spec/support/gitlab-git-test.git`
diff --git a/spec/support/helpers/migrations_helpers.rb b/spec/support/helpers/migrations_helpers.rb
index a3145ed91bd..176788d0506 100644
--- a/spec/support/helpers/migrations_helpers.rb
+++ b/spec/support/helpers/migrations_helpers.rb
@@ -58,7 +58,7 @@ module MigrationsHelpers
     # super: no superclass method `elasticsearch_indexing' for #<ApplicationSetting:0x00007f85628508d8>
     # attr_encrypted also expects ActiveRecord attribute methods to be
     # defined, or it will override the accessors:
-    # https://gitlab.com/gitlab-org/gitlab-ee/issues/8234#note_113976421
+    # https://gitlab.com/gitlab-org/gitlab/issues/8234#note_113976421
     [ApplicationSetting, SystemHook].each do |model|
       model.define_attribute_methods
     end
diff --git a/spec/support/helpers/repo_helpers.rb b/spec/support/helpers/repo_helpers.rb
index ca4d2acbf2c..b5defba332a 100644
--- a/spec/support/helpers/repo_helpers.rb
+++ b/spec/support/helpers/repo_helpers.rb
@@ -59,7 +59,7 @@ Add directory structure for tree_helper spec
 
 This directory structure is needed for a testing the method flatten_tree(tree) in the TreeHelper module
 
-See [merge request #275](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/275#note_732774)
+See [merge request #275](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/275#note_732774)
 
 See merge request !2
 eos
diff --git a/spec/support/shared_examples/boards/multiple_issue_boards_shared_examples.rb b/spec/support/shared_examples/boards/multiple_issue_boards_shared_examples.rb
index f2f31e1b7f2..07c541ec189 100644
--- a/spec/support/shared_examples/boards/multiple_issue_boards_shared_examples.rb
+++ b/spec/support/shared_examples/boards/multiple_issue_boards_shared_examples.rb
@@ -11,6 +11,10 @@ shared_examples_for 'multiple issue boards' do
       wait_for_requests
     end
 
+    it 'shows board switcher' do
+      expect(page).to have_css('.boards-switcher')
+    end
+
     it 'shows current board name' do
       page.within('.boards-switcher') do
         expect(page).to have_content(board.name)