Add latest changes from gitlab-org/gitlab@master

9 files changed, 284 insertions, 28 deletions

diff --git a/spec/lib/gitlab/ci/config/entry/job_spec.rb b/spec/lib/gitlab/ci/config/entry/job_spec.rb
index 4773c0b5e1e..c8b4a8b8a0e 100644
--- a/spec/lib/gitlab/ci/config/entry/job_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/job_spec.rb
@@ -728,27 +728,6 @@ RSpec.describe Gitlab::Ci::Config::Entry::Job, feature_category: :pipeline_compo
                    scheduling_type: :stage,
                    id_tokens: { TEST_ID_TOKEN: { aud: 'https://gitlab.com' } })
         end
-
-        context 'when the FF ci_hooks_pre_get_sources_script is disabled' do
-          before do
-            stub_feature_flags(ci_hooks_pre_get_sources_script: false)
-          end
-
-          it 'returns correct value' do
-            expect(entry.value)
-              .to eq(name: :rspec,
-                     before_script: %w[ls pwd],
-                     script: %w[rspec],
-                     stage: 'test',
-                     ignore: false,
-                     after_script: %w[cleanup],
-                     only: { refs: %w[branches tags] },
-                     job_variables: {},
-                     root_variables_inheritance: true,
-                     scheduling_type: :stage,
-                     id_tokens: { TEST_ID_TOKEN: { aud: 'https://gitlab.com' } })
-          end
-        end
       end
     end
 
diff --git a/spec/lib/gitlab/database/migrations/test_batched_background_runner_spec.rb b/spec/lib/gitlab/database/migrations/test_batched_background_runner_spec.rb
index 57c5011590c..6bcefa455cf 100644
--- a/spec/lib/gitlab/database/migrations/test_batched_background_runner_spec.rb
+++ b/spec/lib/gitlab/database/migrations/test_batched_background_runner_spec.rb
@@ -48,6 +48,7 @@ RSpec.describe Gitlab::Database::Migrations::TestBatchedBackgroundRunner, :freez
     let(:result_dir) { Pathname.new(Dir.mktmpdir) }
     let(:connection) { base_model.connection }
     let(:table_name) { "_test_column_copying" }
+    let(:num_rows_in_table) { 1000 }
     let(:from_id) { 0 }
 
     after do
@@ -61,7 +62,7 @@ RSpec.describe Gitlab::Database::Migrations::TestBatchedBackgroundRunner, :freez
           data bigint default 0
         );
 
-        insert into #{table_name} (id) select i from generate_series(1, 1000) g(i);
+        insert into #{table_name} (id) select i from generate_series(1, #{num_rows_in_table}) g(i);
       SQL
     end
 
@@ -134,6 +135,24 @@ RSpec.describe Gitlab::Database::Migrations::TestBatchedBackgroundRunner, :freez
         expect(calls).not_to be_empty
       end
 
+      it 'samples 1 job with a batch size higher than the table size' do
+        calls = []
+        define_background_migration(migration_name) do |*args|
+          travel 1.minute
+          calls << args
+        end
+
+        queue_migration(migration_name, table_name, :id,
+                        job_interval: 5.minutes,
+                        batch_size: num_rows_in_table * 2,
+                        sub_batch_size: num_rows_in_table * 2)
+
+        described_class.new(result_dir: result_dir, connection: connection,
+                            from_id: from_id).run_jobs(for_duration: 3.minutes)
+
+        expect(calls.size).to eq(1)
+      end
+
       context 'with multiple jobs to run' do
         let(:last_id) do
           Gitlab::Database::SharedModel.using_connection(connection) do
diff --git a/spec/lib/sidebars/concerns/super_sidebar_panel_spec.rb b/spec/lib/sidebars/concerns/super_sidebar_panel_spec.rb
new file mode 100644
index 00000000000..55598948271
--- /dev/null
+++ b/spec/lib/sidebars/concerns/super_sidebar_panel_spec.rb
@@ -0,0 +1,141 @@
+# frozen_string_literal: true
+
+require 'fast_spec_helper'
+
+RSpec.describe Sidebars::Concerns::SuperSidebarPanel, feature_category: :navigation do
+  let(:menu_class_foo) { Class.new(Sidebars::Menu) }
+  let(:menu_foo) { menu_class_foo.new({}) }
+
+  let(:menu_class_bar) do
+    Class.new(Sidebars::Menu) do
+      def title
+        "Bar"
+      end
+    end
+  end
+
+  let(:menu_bar) { menu_class_bar.new({}) }
+
+  subject do
+    Class.new(Sidebars::Panel) do
+      include Sidebars::Concerns::SuperSidebarPanel
+    end.new({})
+  end
+
+  before do
+    allow(menu_foo).to receive(:render?).and_return(true)
+    allow(menu_bar).to receive(:render?).and_return(true)
+  end
+
+  describe '#pick_from_old_menus' do
+    it 'removes element of a given class from a list and adds it to menus' do
+      old_menus = [menu_foo, menu_bar]
+
+      subject.pick_from_old_menus(old_menus, menu_class_foo)
+
+      expect(old_menus).not_to include(menu_foo)
+      expect(subject.renderable_menus).to include(menu_foo)
+    end
+
+    it 'is a noop, if the list does not contain an element of the wanted class' do
+      old_menus = [menu_foo]
+
+      subject.pick_from_old_menus(old_menus, menu_class_bar)
+
+      expect(old_menus).to eq([menu_foo])
+      expect(subject.renderable_menus).to eq([])
+    end
+  end
+
+  describe '#transform_old_menus' do
+    let(:uncategorized_menu) { ::Sidebars::UncategorizedMenu.new({}) }
+
+    let(:menu_item) do
+      Sidebars::MenuItem.new(title: 'foo3', link: 'foo3', active_routes: { controller: 'barc' },
+        super_sidebar_parent: menu_class_foo)
+    end
+
+    let(:nil_menu_item) { Sidebars::NilMenuItem.new(item_id: :nil_item) }
+    let(:existing_item) do
+      Sidebars::MenuItem.new(
+        item_id: :exists,
+        title: 'Existing item',
+        link: 'foo2',
+        active_routes: { controller: 'foo2' }
+      )
+    end
+
+    let(:current_menus) { [menu_foo, uncategorized_menu] }
+
+    before do
+      allow(menu_bar).to receive(:serialize_as_menu_item_args).and_return(nil)
+      menu_foo.add_item(existing_item)
+    end
+
+    context 'for Menus with Menu Items' do
+      before do
+        menu_bar.add_item(menu_item)
+        menu_bar.add_item(nil_menu_item)
+      end
+
+      it 'adds Menu Items to defined super_sidebar_parent' do
+        subject.transform_old_menus(current_menus, menu_bar)
+
+        expect(menu_foo.renderable_items).to eq([existing_item, menu_item])
+        expect(uncategorized_menu.renderable_items).to eq([])
+      end
+
+      it 'adds Menu Items to defined super_sidebar_parent, before super_sidebar_before' do
+        allow(menu_item).to receive(:super_sidebar_before).and_return(:exists)
+        subject.transform_old_menus(current_menus, menu_bar)
+
+        expect(menu_foo.renderable_items).to eq([menu_item, existing_item])
+        expect(uncategorized_menu.renderable_items).to eq([])
+      end
+
+      it 'considers Menu Items uncategorized if super_sidebar_parent is nil' do
+        allow(menu_item).to receive(:super_sidebar_parent).and_return(nil)
+        subject.transform_old_menus(current_menus, menu_bar)
+
+        expect(menu_foo.renderable_items).to eq([existing_item])
+        expect(uncategorized_menu.renderable_items).to eq([menu_item])
+      end
+
+      it 'considers Menu Items uncategorized if super_sidebar_parent cannot be found' do
+        allow(menu_item).to receive(:super_sidebar_parent).and_return(menu_class_bar)
+        subject.transform_old_menus(current_menus, menu_bar)
+
+        expect(menu_foo.renderable_items).to eq([existing_item])
+        expect(uncategorized_menu.renderable_items).to eq([menu_item])
+      end
+
+      it 'considers Menu Items deleted if super_sidebar_parent is Sidebars::NilMenuItem' do
+        allow(menu_item).to receive(:super_sidebar_parent).and_return(::Sidebars::NilMenuItem)
+        subject.transform_old_menus(current_menus, menu_bar)
+
+        expect(menu_foo.renderable_items).to eq([existing_item])
+        expect(uncategorized_menu.renderable_items).to eq([])
+      end
+    end
+
+    it 'converts "solo" top-level Menu entry to Menu Item' do
+      allow(Sidebars::MenuItem).to receive(:new).and_return(menu_item)
+      allow(menu_bar).to receive(:serialize_as_menu_item_args).and_return({})
+
+      subject.transform_old_menus(current_menus, menu_bar)
+
+      expect(menu_foo.renderable_items).to eq([existing_item, menu_item])
+      expect(uncategorized_menu.renderable_items).to eq([])
+    end
+
+    it 'drops "solo" top-level Menu entries, if they serialize to nil' do
+      allow(Sidebars::MenuItem).to receive(:new).and_return(menu_item)
+      allow(menu_bar).to receive(:serialize_as_menu_item_args).and_return(nil)
+
+      subject.transform_old_menus(current_menus, menu_bar)
+
+      expect(menu_foo.renderable_items).to eq([existing_item])
+      expect(uncategorized_menu.renderable_items).to eq([])
+    end
+  end
+end
diff --git a/spec/lib/sidebars/menu_spec.rb b/spec/lib/sidebars/menu_spec.rb
index c84e04a738f..7c4d74aecc8 100644
--- a/spec/lib/sidebars/menu_spec.rb
+++ b/spec/lib/sidebars/menu_spec.rb
@@ -56,6 +56,22 @@ RSpec.describe Sidebars::Menu, feature_category: :navigation do
     end
   end
 
+  describe '#serialize_as_menu_item_args' do
+    it 'returns hash of title, link, active_routes, container_html_options' do
+      allow(menu).to receive(:title).and_return('Title')
+      allow(menu).to receive(:active_routes).and_return({ path: 'foo' })
+      allow(menu).to receive(:container_html_options).and_return({ class: 'foo' })
+      allow(menu).to receive(:link).and_return('/link')
+
+      expect(menu.serialize_as_menu_item_args).to eq({
+        title: 'Title',
+        link: '/link',
+        active_routes: { path: 'foo' },
+        container_html_options: { class: 'foo' }
+      })
+    end
+  end
+
   describe '#render?' do
     context 'when the menus has no items' do
       it 'returns false' do
diff --git a/spec/lib/sidebars/projects/panel_spec.rb b/spec/lib/sidebars/projects/panel_spec.rb
index a581b982f9f..ec1df438cf1 100644
--- a/spec/lib/sidebars/projects/panel_spec.rb
+++ b/spec/lib/sidebars/projects/panel_spec.rb
@@ -13,12 +13,6 @@ RSpec.describe Sidebars::Projects::Panel, feature_category: :navigation do
     expect(subject.scope_menu).to be_a(Sidebars::Projects::Menus::ScopeMenu)
   end
 
-  it 'implements #super_sidebar_context_header' do
-    expect(subject.super_sidebar_context_header).to eq({
-      title: project.name, avatar: project.avatar_url, id: project.id
-    })
-  end
-
   context 'Confluence menu item' do
     subject { described_class.new(context).instance_variable_get(:@menus) }
 
diff --git a/spec/lib/sidebars/projects/super_sidebar_menus/plan_menu_spec.rb b/spec/lib/sidebars/projects/super_sidebar_menus/plan_menu_spec.rb
new file mode 100644
index 00000000000..3917d26f6f2
--- /dev/null
+++ b/spec/lib/sidebars/projects/super_sidebar_menus/plan_menu_spec.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::Projects::SuperSidebarMenus::PlanMenu, feature_category: :navigation do
+  subject { described_class.new({}) }
+
+  it 'has title and sprite_icon' do
+    expect(subject.title).to eq(_("Plan"))
+    expect(subject.sprite_icon).to eq("planning")
+  end
+end
diff --git a/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb b/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb
new file mode 100644
index 00000000000..a4df46ca493
--- /dev/null
+++ b/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::Projects::SuperSidebarPanel, feature_category: :navigation do
+  let_it_be(:project) { create(:project, :repository) }
+
+  let(:user) { project.first_owner }
+
+  let(:context) do
+    double("Stubbed context", current_user: user, container: project, project: project, current_ref: 'master').as_null_object # rubocop:disable RSpec/VerifiedDoubles
+  end
+
+  subject { described_class.new(context) }
+
+  it 'implements #super_sidebar_context_header' do
+    expect(subject.super_sidebar_context_header).to eq(
+      {
+        title: project.name,
+        avatar: project.avatar_url,
+        id: project.id
+      })
+  end
+
+  describe '#renderable_menus' do
+    let(:category_menu) do
+      [
+        Sidebars::StaticMenu,
+        Sidebars::Projects::SuperSidebarMenus::PlanMenu,
+        Sidebars::Projects::Menus::RepositoryMenu,
+        Sidebars::Projects::Menus::CiCdMenu,
+        Sidebars::Projects::Menus::SecurityComplianceMenu,
+        Sidebars::Projects::Menus::DeploymentsMenu,
+        Sidebars::Projects::Menus::PackagesRegistriesMenu,
+        Sidebars::Projects::Menus::InfrastructureMenu,
+        Sidebars::Projects::Menus::MonitorMenu,
+        Sidebars::Projects::Menus::AnalyticsMenu,
+        Sidebars::UncategorizedMenu,
+        Sidebars::Projects::Menus::SettingsMenu
+      ]
+    end
+
+    it "is exposed as a renderable menu" do
+      expect(subject.renderable_menus.map(&:class)).to eq(category_menu)
+    end
+  end
+end
diff --git a/spec/lib/sidebars/static_menu_spec.rb b/spec/lib/sidebars/static_menu_spec.rb
new file mode 100644
index 00000000000..a42fed4b170
--- /dev/null
+++ b/spec/lib/sidebars/static_menu_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::StaticMenu, feature_category: :navigation do
+  let(:context) { {} }
+
+  subject { described_class.new(context) }
+
+  describe '#serialize_for_super_sidebar' do
+    it 'returns flat list of all menu items' do
+      subject.add_item(Sidebars::MenuItem.new(title: 'Is active', link: 'foo2', active_routes: { controller: 'fooc' }))
+      subject.add_item(Sidebars::MenuItem.new(title: 'Not active', link: 'foo3', active_routes: { controller: 'barc' }))
+      subject.add_item(Sidebars::NilMenuItem.new(item_id: 'nil_item'))
+
+      allow(context).to receive(:route_is_active).and_return(->(x) { x[:controller] == 'fooc' })
+
+      expect(subject.serialize_for_super_sidebar).to eq(
+        [
+          {
+            title: "Is active",
+            icon: nil,
+            link: "foo2",
+            is_active: true
+          },
+          {
+            title: "Not active",
+            icon: nil,
+            link: "foo3",
+            is_active: false
+          }
+        ]
+      )
+    end
+  end
+end
diff --git a/spec/lib/sidebars/uncategorized_menu_spec.rb b/spec/lib/sidebars/uncategorized_menu_spec.rb
new file mode 100644
index 00000000000..45e7c0c87e2
--- /dev/null
+++ b/spec/lib/sidebars/uncategorized_menu_spec.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::UncategorizedMenu, feature_category: :navigation do
+  subject { described_class.new({}) }
+
+  it 'has title and sprite_icon' do
+    expect(subject.title).to eq(_("Uncategorized"))
+    expect(subject.sprite_icon).to eq("question")
+  end
+end