From 41fe97390ceddf945f3d967b8fdb3de4c66b7dea Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 18 Mar 2022 20:02:30 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-9-stable-ee

---
 spec/tooling/danger/changelog_spec.rb          | 467 -------------------------
 spec/tooling/danger/datateam_spec.rb           |   8 +-
 spec/tooling/danger/project_helper_spec.rb     |  28 +-
 spec/tooling/docs/deprecation_handling_spec.rb |   2 +-
 spec/tooling/quality/test_level_spec.rb        |   4 +-
 5 files changed, 19 insertions(+), 490 deletions(-)
 delete mode 100644 spec/tooling/danger/changelog_spec.rb

(limited to 'spec/tooling')

diff --git a/spec/tooling/danger/changelog_spec.rb b/spec/tooling/danger/changelog_spec.rb
deleted file mode 100644
index 377c3e881c9..00000000000
--- a/spec/tooling/danger/changelog_spec.rb
+++ /dev/null
@@ -1,467 +0,0 @@
-# frozen_string_literal: true
-
-require 'gitlab-dangerfiles'
-require 'gitlab/dangerfiles/spec_helper'
-
-require_relative '../../../tooling/danger/changelog'
-require_relative '../../../tooling/danger/project_helper'
-
-RSpec.describe Tooling::Danger::Changelog do
-  include_context "with dangerfile"
-
-  let(:fake_danger) { DangerSpecHelper.fake_danger.include(described_class) }
-  let(:fake_project_helper) { double('fake-project-helper', helper: fake_helper).tap { |h| h.class.include(Tooling::Danger::ProjectHelper) } }
-
-  subject(:changelog) { fake_danger.new(helper: fake_helper) }
-
-  before do
-    allow(changelog).to receive(:project_helper).and_return(fake_project_helper)
-  end
-
-  describe '#check_changelog_commit_categories' do
-    context 'when all changelog commits are correct' do
-      it 'does not produce any messages' do
-        commit = double(:commit, message: "foo\nChangelog: fixed")
-
-        allow(changelog).to receive(:changelog_commits).and_return([commit])
-
-        expect(changelog).not_to receive(:fail)
-
-        changelog.check_changelog_commit_categories
-      end
-    end
-
-    context 'when a commit has an incorrect trailer' do
-      it 'adds a message' do
-        commit = double(:commit, message: "foo\nChangelog: foo", sha: '123')
-
-        allow(changelog).to receive(:changelog_commits).and_return([commit])
-
-        expect(changelog).to receive(:fail)
-
-        changelog.check_changelog_commit_categories
-      end
-    end
-  end
-
-  describe '#check_changelog_trailer' do
-    subject { changelog.check_changelog_trailer(commit) }
-
-    context "when commit include a changelog trailer with an unknown category" do
-      let(:commit) { double('commit', message: "Hello world\n\nChangelog: foo", sha: "abc123") }
-
-      it { is_expected.to have_attributes(errors: ["Commit #{commit.sha} uses an invalid changelog category: foo"]) }
-    end
-
-    context 'when a commit uses the wrong casing for a trailer' do
-      let(:commit) { double('commit', message: "Hello world\n\nchangelog: foo", sha: "abc123") }
-
-      it { is_expected.to have_attributes(errors: ["The changelog trailer for commit #{commit.sha} must be `Changelog` (starting with a capital C), not `changelog`"]) }
-    end
-
-    described_class::CATEGORIES.each do |category|
-      context "when commit include a changelog trailer with category set to '#{category}'" do
-        let(:commit) { double('commit', message: "Hello world\n\nChangelog: #{category}", sha: "abc123") }
-
-        it { is_expected.to have_attributes(errors: []) }
-      end
-    end
-  end
-
-  describe '#check_changelog_path' do
-    let(:changelog_path) { 'changelog-path.yml' }
-    let(:foss_change) { nil }
-    let(:ee_change) { nil }
-    let(:changelog_change) { nil }
-    let(:changes) { changes_class.new([foss_change, ee_change, changelog_change].compact) }
-
-    before do
-      allow(changelog).to receive(:present?).and_return(true)
-    end
-
-    subject { changelog.check_changelog_path }
-
-    context "when changelog is not present" do
-      before do
-        allow(changelog).to receive(:present?).and_return(false)
-      end
-
-      it { is_expected.to have_attributes(errors: [], warnings: [], markdowns: [], messages: []) }
-    end
-
-    context "with EE changes" do
-      let(:ee_change) { change_class.new('ee/app/models/foo.rb', :added, :backend) }
-
-      context "and a non-EE changelog, and changelog not required" do
-        before do
-          allow(changelog).to receive(:required?).and_return(false)
-          allow(changelog).to receive(:ee_changelog?).and_return(false)
-        end
-
-        it { is_expected.to have_attributes(warnings: ["This MR changes code in `ee/`, but its Changelog commit is missing the [`EE: true` trailer](https://docs.gitlab.com/ee/development/changelog.html#gitlab-enterprise-changes). Consider adding it to your Changelog commits."]) }
-      end
-
-      context "and a EE changelog" do
-        before do
-          allow(changelog).to receive(:ee_changelog?).and_return(true)
-        end
-
-        it { is_expected.to have_attributes(errors: [], warnings: [], markdowns: [], messages: []) }
-
-        context "and there are DB changes" do
-          let(:foss_change) { change_class.new('db/migrate/foo.rb', :added, :migration) }
-
-          it { is_expected.to have_attributes(warnings: ["This MR has a Changelog commit with the `EE: true` trailer, but there are database changes which [requires](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry) the Changelog commit to not have the `EE: true` trailer. Consider removing the `EE: true` trailer from your commits."]) }
-        end
-      end
-    end
-
-    context "with no EE changes" do
-      let(:foss_change) { change_class.new('app/models/foo.rb', :added, :backend) }
-
-      context "and a non-EE changelog" do
-        before do
-          allow(changelog).to receive(:ee_changelog?).and_return(false)
-        end
-
-        it { is_expected.to have_attributes(errors: [], warnings: [], markdowns: [], messages: []) }
-      end
-
-      context "and a EE changelog" do
-        before do
-          allow(changelog).to receive(:ee_changelog?).and_return(true)
-        end
-
-        it { is_expected.to have_attributes(warnings: ["This MR has a Changelog commit for EE, but no code changes in `ee/`. Consider removing the `EE: true` trailer from your commits."]) }
-      end
-    end
-  end
-
-  describe '#required_reasons' do
-    subject { changelog.required_reasons }
-
-    context "added files contain a migration" do
-      let(:changes) { changes_class.new([change_class.new('foo', :added, :migration)]) }
-
-      it { is_expected.to include(:db_changes) }
-    end
-
-    context "removed files contains a feature flag" do
-      let(:changes) { changes_class.new([change_class.new('foo', :deleted, :feature_flag)]) }
-
-      it { is_expected.to include(:feature_flag_removed) }
-    end
-
-    context "added files do not contain a migration" do
-      let(:changes) { changes_class.new([change_class.new('foo', :added, :frontend)]) }
-
-      it { is_expected.to be_empty }
-    end
-
-    context "removed files do not contain a feature flag" do
-      let(:changes) { changes_class.new([change_class.new('foo', :deleted, :backend)]) }
-
-      it { is_expected.to be_empty }
-    end
-  end
-
-  describe '#required?' do
-    subject { changelog.required? }
-
-    context 'added files contain a migration' do
-      let(:changes) { changes_class.new([change_class.new('foo', :added, :migration)]) }
-
-      it { is_expected.to be_truthy }
-    end
-
-    context "removed files contains a feature flag" do
-      let(:changes) { changes_class.new([change_class.new('foo', :deleted, :feature_flag)]) }
-
-      it { is_expected.to be_truthy }
-    end
-
-    context 'added files do not contain a migration' do
-      let(:changes) { changes_class.new([change_class.new('foo', :added, :frontend)]) }
-
-      it { is_expected.to be_falsey }
-    end
-
-    context "removed files do not contain a feature flag" do
-      let(:changes) { changes_class.new([change_class.new('foo', :deleted, :backend)]) }
-
-      it { is_expected.to be_falsey }
-    end
-  end
-
-  describe '#optional?' do
-    let(:category_with_changelog) { :backend }
-    let(:label_with_changelog) { 'frontend' }
-    let(:category_without_changelog) { Tooling::Danger::Changelog::NO_CHANGELOG_CATEGORIES.first }
-    let(:label_without_changelog) { Tooling::Danger::Changelog::NO_CHANGELOG_LABELS.first }
-
-    subject { changelog.optional? }
-
-    context 'when MR contains only categories requiring no changelog' do
-      let(:changes) { changes_class.new([change_class.new('foo', :modified, category_without_changelog)]) }
-
-      it 'is falsey' do
-        is_expected.to be_falsy
-      end
-    end
-
-    context 'when MR contains a label that require no changelog' do
-      let(:changes) { changes_class.new([change_class.new('foo', :modified, category_with_changelog)]) }
-      let(:mr_labels) { [label_with_changelog, label_without_changelog] }
-
-      it 'is falsey' do
-        is_expected.to be_falsy
-      end
-    end
-
-    context 'when MR contains a category that require changelog and a category that require no changelog' do
-      let(:changes) { changes_class.new([change_class.new('foo', :modified, category_with_changelog), change_class.new('foo', :modified, category_without_changelog)]) }
-
-      context 'with no labels' do
-        it 'is truthy' do
-          is_expected.to be_truthy
-        end
-      end
-
-      context 'with changelog label' do
-        let(:mr_labels) { ['type::feature'] }
-
-        it 'is truthy' do
-          is_expected.to be_truthy
-        end
-      end
-
-      context 'with no changelog label' do
-        let(:mr_labels) { ['type::tooling'] }
-
-        it 'is truthy' do
-          is_expected.to be_falsey
-        end
-      end
-    end
-  end
-
-  describe '#present?' do
-    it 'returns true when a Changelog commit is present' do
-      allow(changelog)
-        .to receive(:valid_changelog_commits)
-        .and_return([double(:commit)])
-
-      expect(changelog).to be_present
-    end
-
-    it 'returns false when a Changelog commit is missing' do
-      allow(changelog).to receive(:valid_changelog_commits).and_return([])
-
-      expect(changelog).not_to be_present
-    end
-  end
-
-  describe '#changelog_commits' do
-    it 'returns the commits that include a Changelog trailer' do
-      commit1 = double(:commit, message: "foo\nChangelog: fixed")
-      commit2 = double(:commit, message: "bar\nChangelog: kittens")
-      commit3 = double(:commit, message: 'testing')
-      git = double(:git)
-
-      allow(changelog).to receive(:git).and_return(git)
-      allow(git).to receive(:commits).and_return([commit1, commit2, commit3])
-
-      expect(changelog.changelog_commits).to eq([commit1, commit2])
-    end
-  end
-
-  describe '#valid_changelog_commits' do
-    it 'returns the commits with a valid Changelog trailer' do
-      commit1 = double(:commit, message: "foo\nChangelog: fixed")
-      commit2 = double(:commit, message: "bar\nChangelog: kittens")
-
-      allow(changelog)
-        .to receive(:changelog_commits)
-        .and_return([commit1, commit2])
-
-      expect(changelog.valid_changelog_commits).to eq([commit1])
-    end
-  end
-
-  describe '#ee_changelog?' do
-    it 'returns true when an EE changelog commit is present' do
-      commit = double(:commit, message: "foo\nEE: true")
-
-      allow(changelog).to receive(:changelog_commits).and_return([commit])
-
-      expect(changelog.ee_changelog?).to eq(true)
-    end
-
-    it 'returns false when an EE changelog commit is missing' do
-      commit = double(:commit, message: 'foo')
-
-      allow(changelog).to receive(:changelog_commits).and_return([commit])
-
-      expect(changelog.ee_changelog?).to eq(false)
-    end
-  end
-
-  describe '#modified_text' do
-    subject { changelog.modified_text }
-
-    context 'when in CI context' do
-      shared_examples 'changelog modified text' do |key|
-        specify do
-          expect(subject).to include('CHANGELOG.md was edited')
-          expect(subject).to include('`Changelog` trailer')
-          expect(subject).to include('`EE: true`')
-        end
-      end
-
-      before do
-        allow(fake_helper).to receive(:ci?).and_return(true)
-      end
-
-      context "when title is not changed from sanitization", :aggregate_failures do
-        let(:mr_title) { 'Fake Title' }
-
-        it_behaves_like 'changelog modified text'
-      end
-
-      context "when title needs sanitization", :aggregate_failures do
-        let(:mr_title) { 'DRAFT: Fake Title' }
-
-        it_behaves_like 'changelog modified text'
-      end
-    end
-
-    context 'when in local context' do
-      let(:mr_title) { 'Fake Title' }
-
-      before do
-        allow(fake_helper).to receive(:ci?).and_return(false)
-      end
-
-      specify do
-        expect(subject).to include('CHANGELOG.md was edited')
-        expect(subject).not_to include('`Changelog` trailer')
-      end
-    end
-  end
-
-  describe '#required_texts' do
-    let(:mr_title) { 'Fake Title' }
-
-    subject { changelog.required_texts }
-
-    context 'when in CI context' do
-      before do
-        allow(fake_helper).to receive(:ci?).and_return(true)
-      end
-
-      shared_examples 'changelog required text' do |key|
-        specify do
-          expect(subject).to have_key(key)
-          expect(subject[key]).to include('CHANGELOG missing')
-          expect(subject[key]).to include('`Changelog` trailer')
-        end
-      end
-
-      context 'with a new migration file' do
-        let(:changes) { changes_class.new([change_class.new('foo', :added, :migration)]) }
-
-        context "when title is not changed from sanitization", :aggregate_failures do
-          it_behaves_like 'changelog required text', :db_changes
-        end
-
-        context "when title needs sanitization", :aggregate_failures do
-          let(:mr_title) { 'DRAFT: Fake Title' }
-
-          it_behaves_like 'changelog required text', :db_changes
-        end
-      end
-
-      context 'with a removed feature flag file' do
-        let(:changes) { changes_class.new([change_class.new('foo', :deleted, :feature_flag)]) }
-
-        it_behaves_like 'changelog required text', :feature_flag_removed
-      end
-    end
-
-    context 'when in local context' do
-      before do
-        allow(fake_helper).to receive(:ci?).and_return(false)
-      end
-
-      shared_examples 'changelog required text' do |key|
-        specify do
-          expect(subject).to have_key(key)
-          expect(subject[key]).to include('CHANGELOG missing')
-          expect(subject[key]).not_to include('`Changelog` trailer')
-        end
-      end
-
-      context 'with a new migration file' do
-        let(:changes) { changes_class.new([change_class.new('foo', :added, :migration)]) }
-
-        context "when title is not changed from sanitization", :aggregate_failures do
-          it_behaves_like 'changelog required text', :db_changes
-        end
-
-        context "when title needs sanitization", :aggregate_failures do
-          let(:mr_title) { 'DRAFT: Fake Title' }
-
-          it_behaves_like 'changelog required text', :db_changes
-        end
-      end
-
-      context 'with a removed feature flag file' do
-        let(:changes) { changes_class.new([change_class.new('foo', :deleted, :feature_flag)]) }
-
-        it_behaves_like 'changelog required text', :feature_flag_removed
-      end
-    end
-  end
-
-  describe '#optional_text' do
-    subject { changelog.optional_text }
-
-    context 'when in CI context' do
-      shared_examples 'changelog optional text' do |key|
-        specify do
-          expect(subject).to include('CHANGELOG missing')
-          expect(subject).to include('`Changelog` trailer')
-          expect(subject).to include('EE: true')
-        end
-      end
-
-      before do
-        allow(fake_helper).to receive(:ci?).and_return(true)
-      end
-
-      context "when title is not changed from sanitization", :aggregate_failures do
-        let(:mr_title) { 'Fake Title' }
-
-        it_behaves_like 'changelog optional text'
-      end
-
-      context "when title needs sanitization", :aggregate_failures do
-        let(:mr_title) { 'DRAFT: Fake Title' }
-
-        it_behaves_like 'changelog optional text'
-      end
-    end
-
-    context 'when in local context' do
-      let(:mr_title) { 'Fake Title' }
-
-      before do
-        allow(fake_helper).to receive(:ci?).and_return(false)
-      end
-
-      specify do
-        expect(subject).to include('CHANGELOG missing')
-      end
-    end
-  end
-end
diff --git a/spec/tooling/danger/datateam_spec.rb b/spec/tooling/danger/datateam_spec.rb
index 3bcef3ac886..e6698dd8970 100644
--- a/spec/tooling/danger/datateam_spec.rb
+++ b/spec/tooling/danger/datateam_spec.rb
@@ -62,28 +62,28 @@ RSpec.describe Tooling::Danger::Datateam do
         'with metric file changes and no performance indicator changes and other label' => {
           modified_files: %w(config/metrics/20210216182127_user_secret_detection_jobs.yml),
           changed_lines: ['-product_stage: growth'],
-          mr_labels: ['type::tooling'],
+          mr_labels: ['type::maintenance'],
           impacted: false,
           impacted_files: []
         },
         'with performance indicator changes and other label' => {
           modified_files: %w(config/metrics/20210216182127_user_secret_detection_jobs.yml app/models/user.rb),
           changed_lines: ['+-gmau'],
-          mr_labels: ['type::tooling'],
+          mr_labels: ['type::maintenance'],
           impacted: true,
           impacted_files: %w(config/metrics/20210216182127_user_secret_detection_jobs.yml)
         },
         'with performance indicator changes, Data Warehouse::Impact Check and other label' => {
           modified_files: %w(config/metrics/20210216182127_user_secret_detection_jobs.yml app/models/user.rb),
           changed_lines: ['+-gmau'],
-          mr_labels: ['type::tooling', 'Data Warehouse::Impact Check'],
+          mr_labels: ['type::maintenance', 'Data Warehouse::Impact Check'],
           impacted: false,
           impacted_files: %w(config/metrics/20210216182127_user_secret_detection_jobs.yml)
         },
         'with performance indicator changes and other labels' => {
           modified_files: %w(config/metrics/20210216182127_user_secret_detection_jobs.yml app/models/user.rb),
           changed_lines: ['+-gmau'],
-          mr_labels: ['type::tooling', 'Data Warehouse::Impacted'],
+          mr_labels: ['type::maintenance', 'Data Warehouse::Impacted'],
           impacted: false,
           impacted_files: %w(config/metrics/20210216182127_user_secret_detection_jobs.yml)
         }
diff --git a/spec/tooling/danger/project_helper_spec.rb b/spec/tooling/danger/project_helper_spec.rb
index 1b416286f8e..902e01e2cbd 100644
--- a/spec/tooling/danger/project_helper_spec.rb
+++ b/spec/tooling/danger/project_helper_spec.rb
@@ -44,7 +44,7 @@ RSpec.describe Tooling::Danger::ProjectHelper do
       'ee/README'       | [:unknown]
 
       'app/assets/foo'                   | [:frontend]
-      'app/views/foo'                    | [:frontend]
+      'app/views/foo'                    | [:frontend, :backend]
       'public/foo'                       | [:frontend]
       'scripts/frontend/foo'             | [:frontend]
       'spec/frontend/bar'                | [:frontend]
@@ -58,7 +58,7 @@ RSpec.describe Tooling::Danger::ProjectHelper do
       'config/deep/foo.js'               | [:frontend]
 
       'ee/app/assets/foo'                | [:frontend]
-      'ee/app/views/foo'                 | [:frontend]
+      'ee/app/views/foo'                 | [:frontend, :backend]
       'ee/spec/frontend/bar'             | [:frontend]
       'ee/spec/frontend_integration/bar' | [:frontend]
 
@@ -166,6 +166,8 @@ RSpec.describe Tooling::Danger::ProjectHelper do
       'lib/gitlab/usage_data_counters/aggregated_metrics/common.yml' | [:product_intelligence]
       'lib/gitlab/usage_data_counters/hll_redis_counter.rb' | [:backend, :product_intelligence]
       'lib/gitlab/tracking.rb' | [:backend, :product_intelligence]
+      'lib/gitlab/usage/service_ping_report.rb' | [:backend, :product_intelligence]
+      'lib/gitlab/usage/metrics/key_path_processor.rb' | [:backend, :product_intelligence]
       'spec/lib/gitlab/tracking_spec.rb' | [:backend, :product_intelligence]
       'app/helpers/tracking_helper.rb' | [:backend, :product_intelligence]
       'spec/helpers/tracking_helper_spec.rb' | [:backend, :product_intelligence]
@@ -181,6 +183,8 @@ RSpec.describe Tooling::Danger::ProjectHelper do
       'config/metrics/schema.json' | [:product_intelligence]
       'doc/api/usage_data.md' | [:product_intelligence]
       'spec/lib/gitlab/usage_data_spec.rb' | [:product_intelligence]
+      'spec/lib/gitlab/usage/service_ping_report.rb' | [:backend, :product_intelligence]
+      'spec/lib/gitlab/usage/metrics/key_path_processor.rb' | [:backend, :product_intelligence]
 
       'app/models/integration.rb' | [:integrations_be, :backend]
       'ee/app/models/integrations/github.rb' | [:integrations_be, :backend]
@@ -213,6 +217,7 @@ RSpec.describe Tooling::Danger::ProjectHelper do
       'ee/lib/ee/gitlab/integrations/sti_type.rb' | [:integrations_be, :backend]
       'ee/lib/ee/api/helpers/integrations_helpers.rb' | [:integrations_be, :backend]
       'ee/app/serializers/integrations/jira_serializers/issue_entity.rb' | [:integrations_be, :backend]
+      'app/serializers/jira_connect/app_data_serializer.rb' | [:integrations_be, :backend]
       'lib/api/github/entities.rb' | [:integrations_be, :backend]
       'lib/api/v3/github.rb' | [:integrations_be, :backend]
       'app/models/clusters/integrations/elastic_stack.rb' | [:backend]
@@ -227,9 +232,12 @@ RSpec.describe Tooling::Danger::ProjectHelper do
       'ee/app/assets/javascripts/integrations/zentao/issues_list/graphql/queries/get_zentao_issues.query.graphql' | [:integrations_fe, :frontend]
       'app/assets/javascripts/pages/projects/settings/integrations/show/index.js' | [:integrations_fe, :frontend]
       'ee/app/assets/javascripts/pages/groups/hooks/index.js' | [:integrations_fe, :frontend]
-      'app/views/clusters/clusters/_integrations_tab.html.haml' | [:frontend]
+      'app/views/clusters/clusters/_integrations_tab.html.haml' | [:frontend, :backend]
       'app/assets/javascripts/alerts_settings/graphql/fragments/integration_item.fragment.graphql' | [:frontend]
       'app/assets/javascripts/filtered_search/droplab/hook_input.js' | [:frontend]
+
+      'app/views/layouts/header/_default.html.haml' | [:frontend, :backend]
+      'app/views/layouts/header/_default.html.erb'  | [:frontend, :backend]
     end
 
     with_them do
@@ -270,7 +278,7 @@ RSpec.describe Tooling::Danger::ProjectHelper do
 
   describe '.local_warning_message' do
     it 'returns an informational message with rules that can run' do
-      expect(described_class.local_warning_message).to eq('==> Only the following Danger rules can be run locally: changelog, ci_config, database, documentation, duplicate_yarn_dependencies, eslint, gitaly, pajamas, pipeline, prettier, product_intelligence, utility_css, vue_shared_documentation, datateam')
+      expect(described_class.local_warning_message).to eq('==> Only the following Danger rules can be run locally: ci_config, database, documentation, duplicate_yarn_dependencies, eslint, gitaly, pajamas, pipeline, prettier, product_intelligence, utility_css, vue_shared_documentation, datateam')
     end
   end
 
@@ -302,18 +310,6 @@ RSpec.describe Tooling::Danger::ProjectHelper do
     end
   end
 
-  describe '#all_ee_changes' do
-    subject { project_helper.all_ee_changes }
-
-    it 'returns all changed files starting with ee/' do
-      changes = double
-      expect(fake_helper).to receive(:changes).and_return(changes)
-      expect(changes).to receive(:files).and_return(%w[fr/ee/beer.rb ee/wine.rb ee/lib/ido.rb ee.k])
-
-      is_expected.to match_array(%w[ee/wine.rb ee/lib/ido.rb])
-    end
-  end
-
   describe '#file_lines' do
     let(:filename) { 'spec/foo_spec.rb' }
     let(:file_spy) { spy }
diff --git a/spec/tooling/docs/deprecation_handling_spec.rb b/spec/tooling/docs/deprecation_handling_spec.rb
index e43f5c7147b..15dd69275c9 100644
--- a/spec/tooling/docs/deprecation_handling_spec.rb
+++ b/spec/tooling/docs/deprecation_handling_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Docs::DeprecationHandling do
         milestones = arguments[:milestones]
         entries = arguments[:entries]
 
-        expect(milestones).to eq(['14.2', '14.10'])
+        expect(milestones).to eq(['14.10', '14.2'])
         expect(entries.map { |e| e['name'] }).to eq(['a.yml', 'b.yml', 'c.yml'])
       end
     end
diff --git a/spec/tooling/quality/test_level_spec.rb b/spec/tooling/quality/test_level_spec.rb
index 33d3a5b49b3..c72e90dc713 100644
--- a/spec/tooling/quality/test_level_spec.rb
+++ b/spec/tooling/quality/test_level_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Quality::TestLevel do
     context 'when level is unit' do
       it 'returns a pattern' do
         expect(subject.pattern(:unit))
-          .to eq("spec/{bin,channels,config,db,dependencies,elastic,elastic_integration,experiments,events,factories,finders,frontend,graphql,haml_lint,helpers,initializers,javascripts,lib,metrics_server,models,policies,presenters,rack_servers,replicators,routing,rubocop,scripts,serializers,services,sidekiq,sidekiq_cluster,spam,support_specs,tasks,uploaders,validators,views,workers,tooling}{,/**/}*_spec.rb")
+          .to eq("spec/{bin,channels,config,db,dependencies,elastic,elastic_integration,experiments,events,factories,finders,frontend,graphql,haml_lint,helpers,initializers,javascripts,lib,metrics_server,models,policies,presenters,rack_servers,replicators,routing,rubocop,scripts,serializers,services,sidekiq,sidekiq_cluster,spam,support_specs,tasks,uploaders,validators,views,workers,tooling,component}{,/**/}*_spec.rb")
       end
     end
 
@@ -110,7 +110,7 @@ RSpec.describe Quality::TestLevel do
     context 'when level is unit' do
       it 'returns a regexp' do
         expect(subject.regexp(:unit))
-          .to eq(%r{spec/(bin|channels|config|db|dependencies|elastic|elastic_integration|experiments|events|factories|finders|frontend|graphql|haml_lint|helpers|initializers|javascripts|lib|metrics_server|models|policies|presenters|rack_servers|replicators|routing|rubocop|scripts|serializers|services|sidekiq|sidekiq_cluster|spam|support_specs|tasks|uploaders|validators|views|workers|tooling)})
+          .to eq(%r{spec/(bin|channels|config|db|dependencies|elastic|elastic_integration|experiments|events|factories|finders|frontend|graphql|haml_lint|helpers|initializers|javascripts|lib|metrics_server|models|policies|presenters|rack_servers|replicators|routing|rubocop|scripts|serializers|services|sidekiq|sidekiq_cluster|spam|support_specs|tasks|uploaders|validators|views|workers|tooling|component)})
       end
     end
 
-- 
cgit v1.2.3