Add latest changes from gitlab-org/gitlab@master

6 files changed, 70 insertions, 41 deletions

diff --git a/spec/lib/gitlab/danger/changelog_spec.rb b/spec/lib/gitlab/danger/changelog_spec.rb
index 64f87ec8cd3..c61e47f80d9 100644
--- a/spec/lib/gitlab/danger/changelog_spec.rb
+++ b/spec/lib/gitlab/danger/changelog_spec.rb
@@ -76,10 +76,10 @@ describe Gitlab::Danger::Changelog do
 
     context 'added files contain a changelog' do
       [
-        'changelogs/unreleased/entry.md',
-        'ee/changelogs/unreleased/entry.md',
-        'changelogs/unreleased-ee/entry.md',
-        'ee/changelogs/unreleased-ee/entry.md'
+        'changelogs/unreleased/entry.yml',
+        'ee/changelogs/unreleased/entry.yml',
+        'changelogs/unreleased-ee/entry.yml',
+        'ee/changelogs/unreleased-ee/entry.yml'
       ].each do |file_path|
         let(:added_files) { [file_path] }
 
@@ -107,46 +107,22 @@ describe Gitlab::Danger::Changelog do
   end
 
   describe '#ee_changelog?' do
-    context 'is ee changelog' do
-      [
-        'changelogs/unreleased-ee/entry.md',
-        'ee/changelogs/unreleased-ee/entry.md'
-      ].each do |file_path|
-        subject { changelog.ee_changelog?(file_path) }
+    subject { changelog.ee_changelog? }
 
-        it { is_expected.to be_truthy }
-      end
+    before do
+      allow(changelog).to receive(:found).and_return(file_path)
     end
 
-    context 'is not ee changelog' do
-      [
-        'changelogs/unreleased/entry.md',
-        'ee/changelogs/unreleased/entry.md'
-      ].each do |file_path|
-        subject { changelog.ee_changelog?(file_path) }
-
-        it { is_expected.to be_falsy }
-      end
-    end
-  end
+    context 'is ee changelog' do
+      let(:file_path) { 'ee/changelogs/unreleased/entry.yml' }
 
-  describe '#ce_port_changelog?' do
-    where(:helper_ee?, :file_path, :expected) do
-      true  | 'changelogs/unreleased-ee/entry.md'    | false
-      true  | 'ee/changelogs/unreleased-ee/entry.md' | false
-      false | 'changelogs/unreleased-ee/entry.md'    | false
-      false | 'ee/changelogs/unreleased-ee/entry.md' | false
-      true  | 'changelogs/unreleased/entry.md'       | true
-      true  | 'ee/changelogs/unreleased/entry.md'    | true
-      false | 'changelogs/unreleased/entry.md'       | false
-      false | 'ee/changelogs/unreleased/entry.md'    | false
+      it { is_expected.to be_truthy }
     end
 
-    with_them do
-      let(:ee?) { helper_ee? }
-      subject { changelog.ce_port_changelog?(file_path) }
+    context 'is not ee changelog' do
+      let(:file_path) { 'changelogs/unreleased/entry.yml' }
 
-      it { is_expected.to eq(expected) }
+      it { is_expected.to be_falsy }
     end
   end
 end
diff --git a/spec/lib/gitlab/danger/helper_spec.rb b/spec/lib/gitlab/danger/helper_spec.rb
index 4cb957f378c..d5d582d7d6c 100644
--- a/spec/lib/gitlab/danger/helper_spec.rb
+++ b/spec/lib/gitlab/danger/helper_spec.rb
@@ -76,6 +76,16 @@ describe Gitlab::Danger::Helper do
     end
   end
 
+  describe '#all_ee_changes' do
+    subject { helper.all_ee_changes }
+
+    it 'returns all changed files starting with ee/' do
+      expect(helper).to receive(:all_changed_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 '#ee?' do
     subject { helper.ee? }
 
diff --git a/spec/lib/gitlab/file_detector_spec.rb b/spec/lib/gitlab/file_detector_spec.rb
index 3972bd24e80..5bf70ef898a 100644
--- a/spec/lib/gitlab/file_detector_spec.rb
+++ b/spec/lib/gitlab/file_detector_spec.rb
@@ -96,14 +96,25 @@ describe Gitlab::FileDetector do
         'swagger.yml', 'swagger.yaml', 'swagger.json',
         'gitlab_swagger.yml', 'openapi_gitlab.yml',
         'OpenAPI.YML', 'openapi.Yaml', 'openapi.JSON',
-        'openapi.gitlab.yml', 'gitlab.openapi.yml'
+        'openapi.gitlab.yml', 'gitlab.openapi.yml',
+        'attention/openapi.yml', 'attention/swagger.yml',
+        'attention/gitlab_swagger.yml', 'attention/openapi_gitlab.yml',
+        'openapi/openapi.yml', 'openapi/swagger.yml',
+        'openapi/my_openapi.yml', 'openapi/swagger_one.yml'
       ]
 
       openapi_types.each do |type_name|
         expect(described_class.type_of(type_name)).to eq(:openapi)
       end
 
-      expect(described_class.type_of('openapiyml')).to be_nil
+      openapi_bad_types = [
+        'openapiyml',
+        'openapi/attention.yaml', 'swagger/attention.yaml'
+      ]
+
+      openapi_bad_types.each do |type_name|
+        expect(described_class.type_of(type_name)).to be_nil
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/metrics/dashboard/service_selector_spec.rb b/spec/lib/gitlab/metrics/dashboard/service_selector_spec.rb
index c0d71bfe5d0..387baf1ee53 100644
--- a/spec/lib/gitlab/metrics/dashboard/service_selector_spec.rb
+++ b/spec/lib/gitlab/metrics/dashboard/service_selector_spec.rb
@@ -15,7 +15,7 @@ describe Gitlab::Metrics::Dashboard::ServiceSelector do
     context 'when just the dashboard path is provided' do
       let(:arguments) { { dashboard_path: '.gitlab/dashboards/test.yml' } }
 
-      it { is_expected.to be Metrics::Dashboard::ProjectDashboardService }
+      it { is_expected.to be Metrics::Dashboard::CustomDashboardService }
 
       context 'when the path is for the system dashboard' do
         let(:arguments) { { dashboard_path: system_dashboard_path } }
diff --git a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
index 058e0737a25..e11613b202d 100644
--- a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
@@ -129,7 +129,8 @@ describe Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob, :clean_gitlab_r
       before do
         allow(AuthorizedProjectsWorker).to receive(:idempotent?).and_return(idempotent)
         allow(duplicate_job).to receive(:duplicate?).and_return(duplicate)
-        stub_feature_flags(drop_duplicate_sidekiq_jobs: feature_enabled)
+        allow(Gitlab::SidekiqMiddleware::DuplicateJobs)
+          .to receive(:drop_duplicates?).with(queue).and_return(feature_enabled)
       end
 
       it 'is droppable when all conditions are met' do
diff --git a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs_spec.rb b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs_spec.rb
new file mode 100644
index 00000000000..fa5938f470b
--- /dev/null
+++ b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::SidekiqMiddleware::DuplicateJobs do
+  using RSpec::Parameterized::TableSyntax
+
+  describe '.drop_duplicates?' do
+    where(:global_feature_enabled, :selected_queue_enabled, :queue, :expected) do
+      true  | true  | described_class::DROPPABLE_QUEUES.first | true
+      true  | true  | "other_queue"                           | true
+      true  | false | described_class::DROPPABLE_QUEUES.first | true
+      true  | false | "other_queue"                           | true
+      false | true  | described_class::DROPPABLE_QUEUES.first | true
+      false | true  | "other_queue"                           | false
+      false | false | described_class::DROPPABLE_QUEUES.first | false
+      false | false | "other_queue"                           | false
+    end
+
+    with_them do
+      before do
+        stub_feature_flags(drop_duplicate_sidekiq_jobs: global_feature_enabled,
+                           drop_duplicate_sidekiq_jobs_for_queue: selected_queue_enabled)
+      end
+
+      it "allows dropping jobs when expected" do
+        expect(described_class.drop_duplicates?(queue)).to be(expected)
+      end
+    end
+  end
+end