Add latest changes from gitlab-org/gitlab@master

7 files changed, 69 insertions, 16 deletions

diff --git a/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap b/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap
index 1586aded6e6..86ccaa43786 100644
--- a/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap
+++ b/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap
@@ -135,13 +135,13 @@ exports[`Learn GitLab renders correctly 1`] = `
           >
             <a
               class="gl-link"
+              data-testid="uncompleted-learn-gitlab-link"
               data-track-action="click_link"
               data-track-experiment="change_continuous_onboarding_link_urls"
               data-track-label="Set up CI/CD"
               data-track-property="Growth::Conversion::Experiment::LearnGitLab"
               href="http://example.com/"
-              rel="noopener noreferrer"
-              target="_blank"
+              target="_self"
             >
               
     Set up CI/CD
@@ -155,13 +155,13 @@ exports[`Learn GitLab renders correctly 1`] = `
           >
             <a
               class="gl-link"
+              data-testid="uncompleted-learn-gitlab-link"
               data-track-action="click_link"
               data-track-experiment="change_continuous_onboarding_link_urls"
               data-track-label="Start a free Ultimate trial"
               data-track-property="Growth::Conversion::Experiment::LearnGitLab"
               href="http://example.com/"
-              rel="noopener noreferrer"
-              target="_blank"
+              target="_self"
             >
               
     Start a free Ultimate trial
@@ -175,13 +175,13 @@ exports[`Learn GitLab renders correctly 1`] = `
           >
             <a
               class="gl-link"
+              data-testid="uncompleted-learn-gitlab-link"
               data-track-action="click_link"
               data-track-experiment="change_continuous_onboarding_link_urls"
               data-track-label="Add code owners"
               data-track-property="Growth::Conversion::Experiment::LearnGitLab"
               href="http://example.com/"
-              rel="noopener noreferrer"
-              target="_blank"
+              target="_self"
             >
               
     Add code owners
@@ -202,13 +202,13 @@ exports[`Learn GitLab renders correctly 1`] = `
           >
             <a
               class="gl-link"
+              data-testid="uncompleted-learn-gitlab-link"
               data-track-action="click_link"
               data-track-experiment="change_continuous_onboarding_link_urls"
               data-track-label="Add merge request approval"
               data-track-property="Growth::Conversion::Experiment::LearnGitLab"
               href="http://example.com/"
-              rel="noopener noreferrer"
-              target="_blank"
+              target="_self"
             >
               
     Add merge request approval
@@ -265,13 +265,13 @@ exports[`Learn GitLab renders correctly 1`] = `
           >
             <a
               class="gl-link"
+              data-testid="uncompleted-learn-gitlab-link"
               data-track-action="click_link"
               data-track-experiment="change_continuous_onboarding_link_urls"
               data-track-label="Create an issue"
               data-track-property="Growth::Conversion::Experiment::LearnGitLab"
               href="http://example.com/"
-              rel="noopener noreferrer"
-              target="_blank"
+              target="_self"
             >
               
     Create an issue
@@ -285,13 +285,13 @@ exports[`Learn GitLab renders correctly 1`] = `
           >
             <a
               class="gl-link"
+              data-testid="uncompleted-learn-gitlab-link"
               data-track-action="click_link"
               data-track-experiment="change_continuous_onboarding_link_urls"
               data-track-label="Submit a merge request"
               data-track-property="Growth::Conversion::Experiment::LearnGitLab"
               href="http://example.com/"
-              rel="noopener noreferrer"
-              target="_blank"
+              target="_self"
             >
               
     Submit a merge request
@@ -341,11 +341,12 @@ exports[`Learn GitLab renders correctly 1`] = `
           >
             <a
               class="gl-link"
+              data-testid="uncompleted-learn-gitlab-link"
               data-track-action="click_link"
               data-track-experiment="change_continuous_onboarding_link_urls"
               data-track-label="Run a Security scan using CI/CD"
               data-track-property="Growth::Conversion::Experiment::LearnGitLab"
-              href="http://example.com/"
+              href="https://docs.gitlab.com/ee/foobar/"
               rel="noopener noreferrer"
               target="_blank"
             >
diff --git a/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_section_link_spec.js b/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_section_link_spec.js
index f7b2154a935..8da3d747b54 100644
--- a/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_section_link_spec.js
+++ b/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_section_link_spec.js
@@ -12,6 +12,10 @@ const defaultProps = {
   completed: false,
 };
 
+const docLinkProps = {
+  url: 'https://docs.gitlab.com/ee/user/application_security/security_dashboard/',
+};
+
 describe('Learn GitLab Section Link', () => {
   let wrapper;
 
@@ -53,6 +57,14 @@ describe('Learn GitLab Section Link', () => {
     expect(wrapper.find('[data-testid="trial-only"]').exists()).toBe(true);
   });
 
+  it('renders doc links with blank target', () => {
+    createWrapper('securityScanEnabled', docLinkProps);
+    const linkElement = wrapper.find('[data-testid="uncompleted-learn-gitlab-link"]');
+
+    expect(linkElement.exists()).toBe(true);
+    expect(linkElement.attributes('target')).toEqual('_blank');
+  });
+
   describe('rendering a link to open the invite_members modal instead of a regular link', () => {
     it.each`
       action           | experimentVariant | showModal
diff --git a/spec/frontend/pages/projects/learn_gitlab/components/mock_data.js b/spec/frontend/pages/projects/learn_gitlab/components/mock_data.js
index 1e633cb7cf5..b21965e8f48 100644
--- a/spec/frontend/pages/projects/learn_gitlab/components/mock_data.js
+++ b/spec/frontend/pages/projects/learn_gitlab/components/mock_data.js
@@ -35,7 +35,7 @@ export const testActions = {
     svg: 'http://example.com/images/illustration.svg',
   },
   securityScanEnabled: {
-    url: 'http://example.com/',
+    url: 'https://docs.gitlab.com/ee/foobar/',
     completed: false,
     svg: 'http://example.com/images/illustration.svg',
   },
diff --git a/spec/lib/gitlab/database/gitlab_schema_spec.rb b/spec/lib/gitlab/database/gitlab_schema_spec.rb
index 255efc99ff6..a5a67c2c918 100644
--- a/spec/lib/gitlab/database/gitlab_schema_spec.rb
+++ b/spec/lib/gitlab/database/gitlab_schema_spec.rb
@@ -44,6 +44,8 @@ RSpec.describe Gitlab::Database::GitlabSchema do
       'my_schema.ci_builds'             | :gitlab_ci
       'information_schema.columns'      | :gitlab_shared
       'audit_events_part_5fc467ac26'    | :gitlab_main
+      '_test_gitlab_main_table'         | :gitlab_main
+      '_test_gitlab_ci_table'           | :gitlab_ci
       '_test_my_table'                  | :gitlab_shared
       'pg_attribute'                    | :gitlab_shared
       'my_other_table'                  | :undefined_my_other_table
diff --git a/spec/migrations/schedule_fix_incorrect_max_seats_used_spec.rb b/spec/migrations/schedule_fix_incorrect_max_seats_used_spec.rb
new file mode 100644
index 00000000000..74258f03630
--- /dev/null
+++ b/spec/migrations/schedule_fix_incorrect_max_seats_used_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe ScheduleFixIncorrectMaxSeatsUsed, :migration do
+  let(:migration) { described_class.new }
+
+  describe '#up' do
+    it 'schedules a job on Gitlab.com' do
+      allow(Gitlab).to receive(:com?).and_return(true)
+
+      expect(migration).to receive(:migrate_in).with(1.hour, 'FixIncorrectMaxSeatsUsed')
+
+      migration.up
+    end
+
+    it 'does not schedule any jobs when not Gitlab.com' do
+      allow(Gitlab::CurrentSettings).to receive(:com?).and_return(false)
+
+      expect(migration).not_to receive(:migrate_in)
+
+      migration.up
+    end
+  end
+end
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb
index d1007eee186..932ff8c1cb9 100644
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
@@ -1303,6 +1303,18 @@ RSpec.describe Ci::Runner do
 
       expect(runners).to eq([runner2, runner1])
     end
+
+    it 'supports ordering by the token expiration' do
+      runner1 = create(:ci_runner, token_expires_at: 1.year.from_now)
+      runner2 = create(:ci_runner)
+      runner3 = create(:ci_runner, token_expires_at: 1.month.from_now)
+
+      runners = described_class.order_by('token_expires_at_asc')
+      expect(runners).to eq([runner3, runner1, runner2])
+
+      runners = described_class.order_by('token_expires_at_desc')
+      expect(runners).to eq([runner2, runner1, runner3])
+    end
   end
 
   describe '.runner_matchers' do
diff --git a/spec/models/concerns/after_commit_queue_spec.rb b/spec/models/concerns/after_commit_queue_spec.rb
index 40cddde333e..8f091081dce 100644
--- a/spec/models/concerns/after_commit_queue_spec.rb
+++ b/spec/models/concerns/after_commit_queue_spec.rb
@@ -75,7 +75,7 @@ RSpec.describe AfterCommitQueue do
         skip_if_multiple_databases_not_setup
 
         table_sql = <<~SQL
-          CREATE TABLE _test_ci_after_commit_queue (
+          CREATE TABLE _test_gitlab_ci_after_commit_queue (
             id serial NOT NULL PRIMARY KEY);
         SQL
 
@@ -84,7 +84,7 @@ RSpec.describe AfterCommitQueue do
 
       let(:ci_klass) do
         Class.new(Ci::ApplicationRecord) do
-          self.table_name = '_test_ci_after_commit_queue'
+          self.table_name = '_test_gitlab_ci_after_commit_queue'
 
           include AfterCommitQueue