Merge remote-tracking branch 'origin/master' into 38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster

18 files changed, 454 insertions, 142 deletions

diff --git a/spec/features/projects/actve_tabs_spec.rb b/spec/features/projects/actve_tabs_spec.rb
index 0bda68b83e7..ce5606b63ae 100644
--- a/spec/features/projects/actve_tabs_spec.rb
+++ b/spec/features/projects/actve_tabs_spec.rb
@@ -35,7 +35,7 @@ describe 'Project active tab' do
       visit project_path(project)
     end
 
-    it_behaves_like 'page has active tab', 'Overview'
+    it_behaves_like 'page has active tab', 'Project'
     it_behaves_like 'page has active sub tab', 'Details'
 
     context 'on project Home/Activity' do
@@ -43,7 +43,7 @@ describe 'Project active tab' do
         click_tab('Activity')
       end
 
-      it_behaves_like 'page has active tab', 'Overview'
+      it_behaves_like 'page has active tab', 'Project'
       it_behaves_like 'page has active sub tab', 'Activity'
     end
   end
diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb
index ac82f869f0f..e7b305925f7 100644
--- a/spec/features/projects/blobs/blob_show_spec.rb
+++ b/spec/features/projects/blobs/blob_show_spec.rb
@@ -14,6 +14,8 @@ feature 'File blob', :js do
   context 'Ruby file' do
     before do
       visit_blob('files/ruby/popen.rb')
+
+      wait_for_requests
     end
 
     it 'displays the blob' do
@@ -48,6 +50,8 @@ feature 'File blob', :js do
     context 'visiting directly' do
       before do
         visit_blob('files/markdown/ruby-style-guide.md')
+
+        wait_for_requests
       end
 
       it 'displays the blob using the rich viewer' do
@@ -159,6 +163,8 @@ feature 'File blob', :js do
         project.update_attribute(:lfs_enabled, true)
 
         visit_blob('files/lfs/file.md')
+
+        wait_for_requests
       end
 
       it 'displays an error' do
@@ -207,6 +213,8 @@ feature 'File blob', :js do
     context 'when LFS is disabled on the project' do
       before do
         visit_blob('files/lfs/file.md')
+
+        wait_for_requests
       end
 
       it 'displays the blob' do
@@ -242,6 +250,8 @@ feature 'File blob', :js do
       ).execute
 
       visit_blob('files/test.pdf')
+
+      wait_for_requests
     end
 
     it 'displays the blob' do
@@ -268,6 +278,8 @@ feature 'File blob', :js do
         project.update_attribute(:lfs_enabled, true)
 
         visit_blob('files/lfs/lfs_object.iso')
+
+        wait_for_requests
       end
 
       it 'displays the blob' do
@@ -290,6 +302,8 @@ feature 'File blob', :js do
     context 'when LFS is disabled on the project' do
       before do
         visit_blob('files/lfs/lfs_object.iso')
+
+        wait_for_requests
       end
 
       it 'displays the blob' do
@@ -313,6 +327,8 @@ feature 'File blob', :js do
   context 'ZIP file' do
     before do
       visit_blob('Gemfile.zip')
+
+      wait_for_requests
     end
 
     it 'displays the blob' do
@@ -347,6 +363,8 @@ feature 'File blob', :js do
       ).execute
 
       visit_blob('files/empty.md')
+
+      wait_for_requests
     end
 
     it 'displays an error' do
diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb
index 90760c6e814..5071a87fa5b 100644
--- a/spec/features/projects/clusters/gcp_spec.rb
+++ b/spec/features/projects/clusters/gcp_spec.rb
@@ -144,6 +144,7 @@ feature 'Gcp Cluster', :js do
 
     it 'user sees a login page' do
       expect(page).to have_css('.signin-with-google')
+      expect(page).to have_link('Google account')
     end
   end
 
diff --git a/spec/features/projects/commit/comments/user_adds_comment_spec.rb b/spec/features/projects/commit/comments/user_adds_comment_spec.rb
new file mode 100644
index 00000000000..6397df086a7
--- /dev/null
+++ b/spec/features/projects/commit/comments/user_adds_comment_spec.rb
@@ -0,0 +1,170 @@
+require "spec_helper"
+
+describe "User adds a comment on a commit", :js do
+  include Spec::Support::Helpers::Features::NotesHelpers
+  include RepoHelpers
+
+  let(:comment_text) { "XML attached" }
+  let(:another_comment_text) { "SVG attached" }
+  let(:project) { create(:project, :repository) }
+  let(:user) { create(:user) }
+
+  before do
+    sign_in(user)
+    project.add_developer(user)
+  end
+
+  context "inline view" do
+    before do
+      visit(project_commit_path(project, sample_commit.id))
+    end
+
+    it "adds a comment" do
+      page.within(".js-main-target-form") do
+        expect(page).not_to have_link("Cancel")
+
+        emoji = ":+1:"
+
+        fill_in("note[note]", with: "#{comment_text} #{emoji}")
+
+        # Check on `Preview` tab
+        click_link("Preview")
+
+        expect(find(".js-md-preview")).to have_content(comment_text).and have_css("gl-emoji")
+        expect(page).not_to have_css(".js-note-text")
+
+        # Check on the `Write` tab
+        click_link("Write")
+
+        expect(page).to have_field("note[note]", with: "#{comment_text} #{emoji}")
+
+        # Submit comment from the `Preview` tab to get rid of a separate `it` block
+        # which would specially tests if everything gets cleared from the note form.
+        click_link("Preview")
+        click_button("Comment")
+      end
+
+      wait_for_requests
+
+      page.within(".note") do
+        expect(page).to have_content(comment_text).and have_css("gl-emoji")
+      end
+
+      page.within(".js-main-target-form") do
+        expect(page).to have_field("note[note]", with: "").and have_no_css(".js-md-preview")
+      end
+    end
+
+    context "when commenting on diff" do
+      it "adds a comment" do
+        page.within(".diff-file:nth-of-type(1)") do
+          # Open a form for a comment and check UI elements are visible and acting as expecting.
+          click_diff_line(sample_commit.line_code)
+
+          expect(page).to have_css(".js-temp-notes-holder form.new-note")
+                    .and have_css(".js-close-discussion-note-form", text: "Cancel")
+
+          # The `Cancel` button closes the current form. The page should not have any open forms after that.
+          find(".js-close-discussion-note-form").click
+
+          expect(page).not_to have_css("form.new_note")
+
+          # Try to open the same form twice. There should be only one form opened.
+          click_diff_line(sample_commit.line_code)
+          click_diff_line(sample_commit.line_code)
+
+          expect(page).to have_css("form.new-note", count: 1)
+
+          # Fill in a form.
+          page.within("form[data-line-code='#{sample_commit.line_code}']") do
+            fill_in("note[note]", with: "#{comment_text} :smile:")
+          end
+
+          # Open another form and check we have two forms now (because the first one is filled in).
+          click_diff_line(sample_commit.del_line_code)
+
+          expect(page).to have_field("note[note]", with: "#{comment_text} :smile:")
+                    .and have_field("note[note]", with: "")
+
+          # Test Preview feature for both forms.
+          page.within("form[data-line-code='#{sample_commit.line_code}']") do
+            click_link("Preview")
+          end
+
+          page.within("form[data-line-code='#{sample_commit.del_line_code}']") do
+            fill_in("note[note]", with: another_comment_text)
+
+            click_link("Preview")
+          end
+
+          expect(page).to have_css(".js-md-preview", visible: true, count: 2)
+                    .and have_content(comment_text)
+                    .and have_content(another_comment_text)
+                    .and have_xpath("//gl-emoji[@data-name='smile']")
+
+          # Test UI elements, then submit.
+          page.within("form[data-line-code='#{sample_commit.line_code}']") do
+            expect(find(".js-note-text", visible: false).text).to eq("")
+            expect(page).to have_css('.js-md-write-button')
+
+            click_button("Comment")
+          end
+
+          expect(page).to have_button("Reply...").and have_no_css("form.new_note")
+        end
+
+        # A comment should be added and visible.
+        page.within(".diff-file:nth-of-type(1) .note") do
+          expect(page).to have_content(comment_text).and have_xpath("//gl-emoji[@data-name='smile']")
+        end
+      end
+    end
+  end
+
+  context "side-by-side view" do
+    before do
+      visit(project_commit_path(project, sample_commit.id, view: "parallel"))
+    end
+
+    it "adds a comment" do
+      new_comment = "New comment"
+      old_comment = "Old comment"
+
+      # Left side.
+      click_parallel_diff_line(sample_commit.del_line_code)
+
+      page.within(".diff-file:nth-of-type(1) form[data-line-code='#{sample_commit.del_line_code}']") do
+        fill_in("note[note]", with: old_comment)
+        click_button("Comment")
+      end
+
+      page.within(".diff-file:nth-of-type(1) .notes_content.parallel.old") do
+        expect(page).to have_content(old_comment)
+      end
+
+      # Right side.
+      click_parallel_diff_line(sample_commit.line_code)
+
+      page.within(".diff-file:nth-of-type(1) form[data-line-code='#{sample_commit.line_code}']") do
+        fill_in("note[note]", with: new_comment)
+        click_button("Comment")
+      end
+
+      wait_for_requests
+
+      expect(all(".diff-file:nth-of-type(1) .notes_content.parallel.new")[1].text).to have_content(new_comment)
+    end
+  end
+
+  private
+
+  def click_diff_line(line)
+    find(".line_holder[id='#{line}'] td:nth-of-type(1)").hover
+    find(".line_holder[id='#{line}'] button").click
+  end
+
+  def click_parallel_diff_line(line)
+    find(".line_holder.parallel td[id='#{line}']").find(:xpath, 'preceding-sibling::*[1][self::td]').hover
+    find(".line_holder.parallel button[data-line-code='#{line}']").click
+  end
+end
diff --git a/spec/features/projects/commit/comments/user_deletes_comments_spec.rb b/spec/features/projects/commit/comments/user_deletes_comments_spec.rb
new file mode 100644
index 00000000000..a727cab4ac7
--- /dev/null
+++ b/spec/features/projects/commit/comments/user_deletes_comments_spec.rb
@@ -0,0 +1,37 @@
+require "spec_helper"
+
+describe "User deletes comments on a commit", :js do
+  include Spec::Support::Helpers::Features::NotesHelpers
+  include RepoHelpers
+
+  let(:comment_text) { "XML attached" }
+  let(:project) { create(:project, :repository) }
+  let(:user) { create(:user) }
+
+  before do
+    sign_in(user)
+    project.add_developer(user)
+
+    visit(project_commit_path(project, sample_commit.id))
+
+    add_note(comment_text)
+  end
+
+  it "deletes comment" do
+    page.within(".note") do
+      expect(page).to have_content(comment_text)
+    end
+
+    page.within(".main-notes-list") do
+      note = find(".note")
+      note.hover
+
+      find(".more-actions").click
+      find(".more-actions .dropdown-menu li", match: :first)
+
+      accept_confirm { find(".js-note-delete").click }
+    end
+
+    expect(page).not_to have_css(".note")
+  end
+end
diff --git a/spec/features/projects/commit/comments/user_edits_comments_spec.rb b/spec/features/projects/commit/comments/user_edits_comments_spec.rb
new file mode 100644
index 00000000000..75bccd99f59
--- /dev/null
+++ b/spec/features/projects/commit/comments/user_edits_comments_spec.rb
@@ -0,0 +1,42 @@
+require "spec_helper"
+
+describe "User edits a comment on a commit", :js do
+  include Spec::Support::Helpers::Features::NotesHelpers
+  include RepoHelpers
+
+  let(:project) { create(:project, :repository) }
+  let(:user) { create(:user) }
+
+  before do
+    sign_in(user)
+    project.add_developer(user)
+
+    visit(project_commit_path(project, sample_commit.id))
+
+    add_note("XML attached")
+  end
+
+  it "edits comment" do
+    NEW_COMMENT_TEXT = "+1 Awesome!".freeze
+
+    page.within(".main-notes-list") do
+      note = find(".note")
+      note.hover
+
+      note.find(".js-note-edit").click
+    end
+
+    page.find(".current-note-edit-form textarea")
+
+    page.within(".current-note-edit-form") do
+      fill_in("note[note]", with: NEW_COMMENT_TEXT)
+      click_button("Save comment")
+    end
+
+    wait_for_requests
+
+    page.within(".note") do
+      expect(page).to have_content(NEW_COMMENT_TEXT)
+    end
+  end
+end
diff --git a/spec/features/projects/commit/user_comments_on_commit_spec.rb b/spec/features/projects/commit/user_comments_on_commit_spec.rb
deleted file mode 100644
index 5174f793367..00000000000
--- a/spec/features/projects/commit/user_comments_on_commit_spec.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-require "spec_helper"
-
-describe "User comments on commit", :js do
-  include Spec::Support::Helpers::Features::NotesHelpers
-  include RepoHelpers
-
-  let(:project) { create(:project, :repository) }
-  let(:user) { create(:user) }
-
-  COMMENT_TEXT = "XML attached".freeze
-
-  before do
-    sign_in(user)
-    project.add_developer(user)
-
-    visit(project_commit_path(project, sample_commit.id))
-  end
-
-  context "when adding new comment" do
-    it "adds comment" do
-      EMOJI = ":+1:".freeze
-
-      page.within(".js-main-target-form") do
-        expect(page).not_to have_link("Cancel")
-
-        fill_in("note[note]", with: "#{COMMENT_TEXT} #{EMOJI}")
-
-        # Check on `Preview` tab
-        click_link("Preview")
-
-        expect(find(".js-md-preview")).to have_content(COMMENT_TEXT).and have_css("gl-emoji")
-        expect(page).not_to have_css(".js-note-text")
-
-        # Check on `Write` tab
-        click_link("Write")
-
-        expect(page).to have_field("note[note]", with: "#{COMMENT_TEXT} #{EMOJI}")
-
-        # Submit comment from the `Preview` tab to get rid of a separate `it` block
-        # which would specially tests if everything gets cleared from the note form.
-        click_link("Preview")
-        click_button("Comment")
-      end
-
-      wait_for_requests
-
-      page.within(".note") do
-        expect(page).to have_content(COMMENT_TEXT).and have_css("gl-emoji")
-      end
-
-      page.within(".js-main-target-form") do
-        expect(page).to have_field("note[note]", with: "").and have_no_css(".js-md-preview")
-      end
-    end
-  end
-
-  context "when editing comment" do
-    before do
-      add_note(COMMENT_TEXT)
-    end
-
-    it "edits comment" do
-      NEW_COMMENT_TEXT = "+1 Awesome!".freeze
-
-      page.within(".main-notes-list") do
-        note = find(".note")
-        note.hover
-
-        note.find(".js-note-edit").click
-      end
-
-      page.find(".current-note-edit-form textarea")
-
-      page.within(".current-note-edit-form") do
-        fill_in("note[note]", with: NEW_COMMENT_TEXT)
-        click_button("Save comment")
-      end
-
-      wait_for_requests
-
-      page.within(".note") do
-        expect(page).to have_content(NEW_COMMENT_TEXT)
-      end
-    end
-  end
-
-  context "when deleting comment" do
-    before do
-      add_note(COMMENT_TEXT)
-    end
-
-    it "deletes comment" do
-      page.within(".note") do
-        expect(page).to have_content(COMMENT_TEXT)
-      end
-
-      page.within(".main-notes-list") do
-        note = find(".note")
-        note.hover
-
-        find(".more-actions").click
-        find(".more-actions .dropdown-menu li", match: :first)
-
-        accept_confirm { find(".js-note-delete").click }
-      end
-
-      expect(page).not_to have_css(".note")
-    end
-  end
-end
diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb
index 5248a783db4..f9defa22d35 100644
--- a/spec/features/projects/environments/environments_spec.rb
+++ b/spec/features/projects/environments/environments_spec.rb
@@ -42,6 +42,22 @@ feature 'Environments page', :js do
           expect(page).to have_content('You don\'t have any environments right now')
         end
       end
+
+      context 'when cluster is not reachable' do
+        let!(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
+        let!(:application_prometheus) { create(:clusters_applications_prometheus, :installed, cluster: cluster) }
+
+        before do
+          allow_any_instance_of(Kubeclient::Client).to receive(:proxy_url).and_raise(Kubeclient::HttpError.new(401, 'Unauthorized', nil))
+        end
+
+        it 'should show one environment without error' do
+          visit_environments(project, scope: 'available')
+
+          expect(page).to have_css('.environments-container')
+          expect(page.all('.environment-name').length).to eq(1)
+        end
+      end
     end
 
     describe 'with one stopped environment' do
diff --git a/spec/features/projects/issues/user_sorts_issues_spec.rb b/spec/features/projects/issues/user_sorts_issues_spec.rb
index c3d63000dac..db5936a30cb 100644
--- a/spec/features/projects/issues/user_sorts_issues_spec.rb
+++ b/spec/features/projects/issues/user_sorts_issues_spec.rb
@@ -18,7 +18,7 @@ describe "User sorts issues" do
   it "sorts by popularity" do
     find("button.dropdown-toggle").click
 
-    page.within(".content ul.dropdown-menu.dropdown-menu-align-right li") do
+    page.within(".content ul.dropdown-menu.dropdown-menu-right li") do
       click_link("Popularity")
     end
 
diff --git a/spec/features/projects/merge_requests/user_creates_merge_request_spec.rb b/spec/features/projects/merge_requests/user_creates_merge_request_spec.rb
index f285c6c8783..1f21ef7b382 100644
--- a/spec/features/projects/merge_requests/user_creates_merge_request_spec.rb
+++ b/spec/features/projects/merge_requests/user_creates_merge_request_spec.rb
@@ -1,32 +1,84 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe 'User creates a merge request', :js do
+describe "User creates a merge request", :js do
+  include ProjectForksHelper
+
+  let(:title) { "Some feature" }
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
 
   before do
     project.add_master(user)
     sign_in(user)
+  end
 
+  it "creates a merge request" do
     visit(project_new_merge_request_path(project))
-  end
 
-  it 'creates a merge request' do
-    find('.js-source-branch').click
-    click_link('fix')
+    find(".js-source-branch").click
+    click_link("fix")
 
-    find('.js-target-branch').click
-    click_link('feature')
+    find(".js-target-branch").click
+    click_link("feature")
 
-    click_button('Compare branches')
+    click_button("Compare branches")
 
-    fill_in('merge_request_title', with: 'Wiki Feature')
-    click_button('Submit merge request')
+    fill_in("Title", with: title)
+    click_button("Submit merge request")
 
-    page.within('.merge-request') do
-      expect(page).to have_content('Wiki Feature')
+    page.within(".merge-request") do
+      expect(page).to have_content(title)
     end
+  end
+
+  context "to a forked project" do
+    let(:forked_project) { fork_project(project, user, namespace: user.namespace, repository: true) }
+
+    it "creates a merge request" do
+      visit(project_new_merge_request_path(forked_project))
+
+      expect(page).to have_content("Source branch").and have_content("Target branch")
+      expect(find("#merge_request_target_project_id", visible: false).value).to eq(project.id.to_s)
+
+      click_button("Compare branches and continue")
+
+      expect(page).to have_content("You must select source and target branch")
+
+      first(".js-source-project").click
+      first(".dropdown-source-project a", text: forked_project.full_path)
+
+      first(".js-target-project").click
+      first(".dropdown-target-project a", text: project.full_path)
+
+      first(".js-source-branch").click
 
-    wait_for_requests
+      wait_for_requests
+
+      source_branch = "fix"
+
+      first(".js-source-branch-dropdown .dropdown-content a", text: source_branch).click
+
+      click_button("Compare branches and continue")
+
+      expect(page).to have_css("h3.page-title", text: "New Merge Request")
+
+      page.within("form#new_merge_request") do
+        fill_in("Title", with: title)
+      end
+
+      click_button("Assignee")
+
+      expect(find(".js-assignee-search")["data-project-id"]).to eq(project.id.to_s)
+
+      page.within(".dropdown-menu-user") do
+        expect(page).to have_content("Unassigned")
+                   .and have_content(user.name)
+                   .and have_content(project.users.first.name)
+      end
+
+      click_button("Submit merge request")
+
+      expect(page).to have_content(title).and have_content("Request to merge #{user.namespace.name}:#{source_branch} into master")
+    end
   end
 end
diff --git a/spec/features/projects/merge_requests/user_sorts_merge_requests_spec.rb b/spec/features/projects/merge_requests/user_sorts_merge_requests_spec.rb
index d8d9f7e2a8c..305658f1b5d 100644
--- a/spec/features/projects/merge_requests/user_sorts_merge_requests_spec.rb
+++ b/spec/features/projects/merge_requests/user_sorts_merge_requests_spec.rb
@@ -18,7 +18,7 @@ describe 'User sorts merge requests' do
   it 'keeps the sort option' do
     find('button.dropdown-toggle').click
 
-    page.within('.content ul.dropdown-menu.dropdown-menu-align-right li') do
+    page.within('.content ul.dropdown-menu.dropdown-menu-right li') do
       click_link('Last updated')
     end
 
@@ -43,7 +43,7 @@ describe 'User sorts merge requests' do
     it 'sorts by popularity' do
       find('button.dropdown-toggle').click
 
-      page.within('.content ul.dropdown-menu.dropdown-menu-align-right li') do
+      page.within('.content ul.dropdown-menu.dropdown-menu-right li') do
         click_link('Popularity')
       end
 
diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index a29c21f6fef..af2a9567a47 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -165,7 +165,7 @@ describe 'Pipeline', :js do
       end
 
       it 'shows Pipeline tab as active' do
-        expect(page).to have_css('.js-pipeline-tab-link.active')
+        expect(page).to have_css('.js-pipeline-tab-link .active')
       end
 
       context 'without permission to access builds' do
@@ -271,7 +271,7 @@ describe 'Pipeline', :js do
       end
 
       it 'shows Jobs tab as active' do
-        expect(page).to have_css('li.js-builds-tab-link.active')
+        expect(page).to have_css('li.js-builds-tab-link .active')
       end
     end
 
diff --git a/spec/features/projects/settings/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb
index e875a88a52b..cfdae246c09 100644
--- a/spec/features/projects/settings/pipelines_settings_spec.rb
+++ b/spec/features/projects/settings/pipelines_settings_spec.rb
@@ -75,6 +75,29 @@ describe "Projects > Settings > Pipelines settings" do
         expect(project.auto_devops).not_to be_enabled
         expect(project.auto_devops.domain).to eq('test.com')
       end
+
+      context 'when there is a cluster with ingress and external_ip' do
+        before do
+          cluster = create(:cluster, projects: [project])
+          cluster.create_application_ingress!(external_ip: '192.168.1.100')
+        end
+
+        it 'shows the help text with the nip.io domain as an alternative to custom domain' do
+          visit project_settings_ci_cd_path(project)
+          expect(page).to have_content('192.168.1.100.nip.io can be used as an alternative to a custom domain')
+        end
+      end
+
+      context 'when there is no ingress' do
+        before do
+          create(:cluster, projects: [project])
+        end
+
+        it 'alternative to custom domain is not shown' do
+          visit project_settings_ci_cd_path(project)
+          expect(page).not_to have_content('can be used as an alternative to a custom domain')
+        end
+      end
     end
   end
 end
diff --git a/spec/features/projects/settings/project_badges_spec.rb b/spec/features/projects/settings/project_badges_spec.rb
index cc3551a4c21..4893bef8884 100644
--- a/spec/features/projects/settings/project_badges_spec.rb
+++ b/spec/features/projects/settings/project_badges_spec.rb
@@ -22,7 +22,7 @@ feature 'Project Badges' do
     page.within '.badge-settings' do
       wait_for_requests
 
-      rows = all('.panel-body > div')
+      rows = all('.card-body > div')
       expect(rows.length).to eq 2
       expect(rows[0]).to have_content group_badge.link_url
       expect(rows[1]).to have_content project_badge.link_url
@@ -49,7 +49,7 @@ feature 'Project Badges' do
         click_button 'Add badge'
         wait_for_requests
 
-        within '.panel-body' do
+        within '.card-body' do
           expect(find('a')[:href]).to eq badge_link_url
           expect(find('a img')[:src]).to eq badge_image_url
         end
@@ -61,7 +61,7 @@ feature 'Project Badges' do
     it 'form is shown when clicking edit button in list' do
       page.within '.badge-settings' do
         wait_for_requests
-        rows = all('.panel-body > div')
+        rows = all('.card-body > div')
         expect(rows.length).to eq 2
         rows[1].find('[aria-label="Edit"]').click
 
@@ -75,7 +75,7 @@ feature 'Project Badges' do
     it 'updates a badge when submitting the edit form' do
       page.within '.badge-settings' do
         wait_for_requests
-        rows = all('.panel-body > div')
+        rows = all('.card-body > div')
         expect(rows.length).to eq 2
         rows[1].find('[aria-label="Edit"]').click
         within 'form' do
@@ -86,7 +86,7 @@ feature 'Project Badges' do
           wait_for_requests
         end
 
-        rows = all('.panel-body > div')
+        rows = all('.card-body > div')
         expect(rows.length).to eq 2
         expect(rows[1]).to have_content badge_link_url
       end
@@ -100,7 +100,7 @@ feature 'Project Badges' do
 
     it 'shows a modal when deleting a badge' do
       wait_for_requests
-      rows = all('.panel-body > div')
+      rows = all('.card-body > div')
       expect(rows.length).to eq 2
 
       click_delete_button(rows[1])
@@ -110,14 +110,14 @@ feature 'Project Badges' do
 
     it 'deletes a badge when confirming the modal' do
       wait_for_requests
-      rows = all('.panel-body > div')
+      rows = all('.card-body > div')
       expect(rows.length).to eq 2
       click_delete_button(rows[1])
 
       find('.modal .btn-danger').click
       wait_for_requests
 
-      rows = all('.panel-body > div')
+      rows = all('.card-body > div')
       expect(rows.length).to eq 1
       expect(rows[0]).to have_content group_badge.link_url
     end
diff --git a/spec/features/projects/user_sees_sidebar_spec.rb b/spec/features/projects/user_sees_sidebar_spec.rb
index cf80517b934..8a9255db9e8 100644
--- a/spec/features/projects/user_sees_sidebar_spec.rb
+++ b/spec/features/projects/user_sees_sidebar_spec.rb
@@ -37,7 +37,7 @@ describe 'Projects > User sees sidebar' do
       visit project_path(project)
 
       within('.nav-sidebar') do
-        expect(page).to have_content 'Overview'
+        expect(page).to have_content 'Project'
         expect(page).to have_content 'Issues'
         expect(page).to have_content 'Wiki'
 
diff --git a/spec/features/projects/user_uses_shortcuts_spec.rb b/spec/features/projects/user_uses_shortcuts_spec.rb
index 47c5a8161d9..495a010b32c 100644
--- a/spec/features/projects/user_uses_shortcuts_spec.rb
+++ b/spec/features/projects/user_uses_shortcuts_spec.rb
@@ -13,6 +13,8 @@ describe 'User uses shortcuts', :js do
 
   context 'when navigating to the Project pages' do
     it 'redirects to the details page' do
+      visit project_issues_path(project)
+
       find('body').native.send_key('g')
       find('body').native.send_key('p')
 
@@ -22,7 +24,7 @@ describe 'User uses shortcuts', :js do
 
     it 'redirects to the activity page' do
       find('body').native.send_key('g')
-      find('body').native.send_key('e')
+      find('body').native.send_key('v')
 
       expect(page).to have_active_navigation('Project')
       expect(page).to have_active_sub_navigation('Activity')
@@ -72,10 +74,19 @@ describe 'User uses shortcuts', :js do
       expect(page).to have_active_sub_navigation('List')
     end
 
+    it 'redirects to the issue board page' do
+      find('body').native.send_key('g')
+      find('body').native.send_key('b')
+
+      expect(page).to have_active_navigation('Issues')
+      expect(page).to have_active_sub_navigation('Board')
+    end
+
     it 'redirects to the new issue page' do
       find('body').native.send_key('i')
 
       expect(page).to have_content(project.title)
+      expect(page).to have_content('New Issue')
     end
   end
 
@@ -88,6 +99,34 @@ describe 'User uses shortcuts', :js do
     end
   end
 
+  context 'when navigating to the CI / CD pages' do
+    it 'redirects to the Jobs page' do
+      find('body').native.send_key('g')
+      find('body').native.send_key('j')
+
+      expect(page).to have_active_navigation('CI / CD')
+      expect(page).to have_active_sub_navigation('Jobs')
+    end
+  end
+
+  context 'when navigating to the Operations pages' do
+    it 'redirects to the Environments page' do
+      find('body').native.send_key('g')
+      find('body').native.send_key('e')
+
+      expect(page).to have_active_navigation('Operations')
+      expect(page).to have_active_sub_navigation('Environments')
+    end
+
+    it 'redirects to the Kubernetes page' do
+      find('body').native.send_key('g')
+      find('body').native.send_key('k')
+
+      expect(page).to have_active_navigation('Operations')
+      expect(page).to have_active_sub_navigation('Kubernetes')
+    end
+  end
+
   context 'when navigating to the Snippets pages' do
     it 'redirects to the snippets page' do
       find('body').native.send_key('g')
diff --git a/spec/features/projects/wiki/markdown_preview_spec.rb b/spec/features/projects/wiki/markdown_preview_spec.rb
index 6586ccaa400..e473739a6aa 100644
--- a/spec/features/projects/wiki/markdown_preview_spec.rb
+++ b/spec/features/projects/wiki/markdown_preview_spec.rb
@@ -155,4 +155,27 @@ feature 'Projects > Wiki > User previews markdown changes', :js do
       end
     end
   end
+
+  it "does not linkify double brackets inside code blocks as expected" do
+    click_link 'New page'
+    page.within '#modal-new-wiki' do
+      fill_in :new_wiki_path, with: 'linkify_test'
+      click_button 'Create page'
+    end
+
+    page.within '.wiki-form' do
+      fill_in :wiki_content, with: <<-HEREDOC
+        `[[do_not_linkify]]`
+        ```
+        [[also_do_not_linkify]]
+        ```
+      HEREDOC
+      click_on "Preview"
+    end
+
+    expect(page).to have_content("do_not_linkify")
+
+    expect(page.html).to include('[[do_not_linkify]]')
+    expect(page.html).to include('[[also_do_not_linkify]]')
+  end
 end
diff --git a/spec/features/projects/wiki/user_deletes_wiki_page_spec.rb b/spec/features/projects/wiki/user_deletes_wiki_page_spec.rb
index ab9420fc38f..2c67cec6b67 100644
--- a/spec/features/projects/wiki/user_deletes_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_deletes_wiki_page_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'User deletes wiki page' do
+feature 'User deletes wiki page', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
   let(:wiki_page) { create(:wiki_page, wiki: project.wiki) }
@@ -13,6 +13,7 @@ feature 'User deletes wiki page' do
   it 'deletes a page' do
     click_on('Edit')
     click_on('Delete')
+    find('.js-modal-primary-action').click
 
     expect(page).to have_content('Page was successfully deleted')
   end