Add latest changes from gitlab-org/gitlab@master

6 files changed, 9 insertions, 134 deletions

diff --git a/spec/experiments/new_project_sast_enabled_experiment_spec.rb b/spec/experiments/new_project_sast_enabled_experiment_spec.rb
index 38f58c01973..041e5dfa469 100644
--- a/spec/experiments/new_project_sast_enabled_experiment_spec.rb
+++ b/spec/experiments/new_project_sast_enabled_experiment_spec.rb
@@ -4,7 +4,12 @@ require 'spec_helper'
 
 RSpec.describe NewProjectSastEnabledExperiment do
   it "defines the expected behaviors and variants" do
-    expect(subject.behaviors.keys).to match_array(%w[control candidate free_indicator unchecked_candidate])
+    expect(subject.variant_names).to match_array([
+      :candidate,
+      :free_indicator,
+      :unchecked_candidate,
+      :unchecked_free_indicator
+    ])
   end
 
   it "publishes to the database" do
diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 7f80bed04a4..7e3de32b965 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -1752,116 +1752,6 @@ RSpec.describe Gitlab::Database::MigrationHelpers do
     end
   end
 
-  describe '#change_column_type_using_background_migration' do
-    let!(:issue) { create(:issue, :closed, closed_at: Time.zone.now) }
-
-    let(:issue_model) do
-      Class.new(ActiveRecord::Base) do
-        self.table_name = 'issues'
-        include EachBatch
-      end
-    end
-
-    it 'changes the type of a column using a background migration' do
-      expect(model)
-        .to receive(:add_column)
-        .with('issues', 'closed_at_for_type_change', :datetime_with_timezone)
-
-      expect(model)
-        .to receive(:install_rename_triggers)
-        .with('issues', :closed_at, 'closed_at_for_type_change')
-
-      expect(BackgroundMigrationWorker)
-        .to receive(:perform_in)
-        .ordered
-        .with(
-          10.minutes,
-          'CopyColumn',
-          ['issues', :closed_at, 'closed_at_for_type_change', issue.id, issue.id]
-        )
-
-      expect(BackgroundMigrationWorker)
-        .to receive(:perform_in)
-        .ordered
-        .with(
-          1.hour + 10.minutes,
-          'CleanupConcurrentTypeChange',
-          ['issues', :closed_at, 'closed_at_for_type_change']
-        )
-
-      expect(Gitlab::BackgroundMigration)
-        .to receive(:steal)
-        .ordered
-        .with('CopyColumn')
-
-      expect(Gitlab::BackgroundMigration)
-        .to receive(:steal)
-        .ordered
-        .with('CleanupConcurrentTypeChange')
-
-      model.change_column_type_using_background_migration(
-        issue_model.all,
-        :closed_at,
-        :datetime_with_timezone
-      )
-    end
-  end
-
-  describe '#rename_column_using_background_migration' do
-    let!(:issue) { create(:issue, :closed, closed_at: Time.zone.now) }
-
-    it 'renames a column using a background migration' do
-      expect(model)
-        .to receive(:add_column)
-        .with(
-          'issues',
-          :closed_at_timestamp,
-          :datetime_with_timezone,
-          limit: anything,
-          precision: anything,
-          scale: anything
-        )
-
-      expect(model)
-        .to receive(:install_rename_triggers)
-        .with('issues', :closed_at, :closed_at_timestamp)
-
-      expect(BackgroundMigrationWorker)
-        .to receive(:perform_in)
-        .ordered
-        .with(
-          10.minutes,
-          'CopyColumn',
-          ['issues', :closed_at, :closed_at_timestamp, issue.id, issue.id]
-        )
-
-      expect(BackgroundMigrationWorker)
-        .to receive(:perform_in)
-        .ordered
-        .with(
-          1.hour + 10.minutes,
-          'CleanupConcurrentRename',
-          ['issues', :closed_at, :closed_at_timestamp]
-        )
-
-      expect(Gitlab::BackgroundMigration)
-        .to receive(:steal)
-        .ordered
-        .with('CopyColumn')
-
-      expect(Gitlab::BackgroundMigration)
-        .to receive(:steal)
-        .ordered
-        .with('CleanupConcurrentRename')
-
-      model.rename_column_using_background_migration(
-        'issues',
-        :closed_at,
-        :closed_at_timestamp
-      )
-    end
-  end
-
   describe '#convert_to_bigint_column' do
     it 'returns the name of the temporary column used to convert to bigint' do
       expect(model.convert_to_bigint_column(:id)).to eq('id_convert_to_bigint')
@@ -2065,8 +1955,6 @@ RSpec.describe Gitlab::Database::MigrationHelpers do
         t.integer :other_id
         t.timestamps
       end
-
-      allow(model).to receive(:perform_background_migration_inline?).and_return(false)
     end
 
     context 'when the target table does not exist' do
diff --git a/spec/lib/gitlab/database/migrations/background_migration_helpers_spec.rb b/spec/lib/gitlab/database/migrations/background_migration_helpers_spec.rb
index 7afaade69b1..0abb76b9f8a 100644
--- a/spec/lib/gitlab/database/migrations/background_migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migrations/background_migration_helpers_spec.rb
@@ -438,26 +438,6 @@ RSpec.describe Gitlab::Database::Migrations::BackgroundMigrationHelpers do
     it_behaves_like 'helpers that enqueue background migrations', BackgroundMigrationWorker, 'main'
   end
 
-  describe '#perform_background_migration_inline?' do
-    it 'returns true in a test environment' do
-      stub_rails_env('test')
-
-      expect(model.perform_background_migration_inline?).to eq(true)
-    end
-
-    it 'returns true in a development environment' do
-      stub_rails_env('development')
-
-      expect(model.perform_background_migration_inline?).to eq(true)
-    end
-
-    it 'returns false in a production environment' do
-      stub_rails_env('production')
-
-      expect(model.perform_background_migration_inline?).to eq(false)
-    end
-  end
-
   describe '#delete_job_tracking' do
     let!(:job_class_name) { 'TestJob' }
 
diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb
index 1981e8c0291..03e46f0d7b9 100644
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
@@ -28,6 +28,7 @@ RSpec.describe Namespace do
     it { is_expected.to have_one :onboarding_progress }
     it { is_expected.to have_one :admin_note }
     it { is_expected.to have_many :pending_builds }
+    it { is_expected.to have_one :namespace_route }
 
     describe '#children' do
       let_it_be(:group) { create(:group) }
diff --git a/spec/models/route_spec.rb b/spec/models/route_spec.rb
index b2fa9c24535..0489a4fb995 100644
--- a/spec/models/route_spec.rb
+++ b/spec/models/route_spec.rb
@@ -8,6 +8,7 @@ RSpec.describe Route do
 
   describe 'relationships' do
     it { is_expected.to belong_to(:source) }
+    it { is_expected.to belong_to(:namespace) }
   end
 
   describe 'validations' do
diff --git a/spec/support/shared_examples/loose_foreign_keys/have_loose_foreign_key.rb b/spec/support/shared_examples/loose_foreign_keys/have_loose_foreign_key.rb
index 3af365733d6..5f8e2c19957 100644
--- a/spec/support/shared_examples/loose_foreign_keys/have_loose_foreign_key.rb
+++ b/spec/support/shared_examples/loose_foreign_keys/have_loose_foreign_key.rb
@@ -59,7 +59,7 @@ RSpec.shared_examples 'cleanup by a loose foreign key' do
     model.class.find_by(primary_key => model.public_send(primary_key))
   end
 
-  it 'deletes the model' do
+  it 'cleans up (delete or nullify) the model' do
     parent.delete
 
     expect(find_model).to be_present