Automatic merge of gitlab-org/gitlab master

ee/app/models/groups/repository_storage_move.rb

@@ -5,11 +5,26 @@
 # balance storage capacity.
 module Groups
   class RepositoryStorageMove < ApplicationRecord
+    extend ::Gitlab::Utils::Override
+    include RepositoryStorageMovable
+
     self.table_name = 'group_repository_storage_moves'
 
     belongs_to :container, class_name: 'Group', inverse_of: :repository_storage_moves, foreign_key: :group_id
     alias_attribute :group, :container
 
     scope :with_groups, -> { includes(container: :route) }
+
+    override :schedule_repository_storage_update_worker
+    def schedule_repository_storage_update_worker
+      # No-op. It will be implemented in https://gitlab.com/gitlab-org/gitlab/-/issues/299059
+    end
+
+    private
+
+    override :error_key
+    def error_key
+      :group
+    end
   end
 end

ee/spec/factories/group_repository_storage_moves.rb

+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :group_repository_storage_move, class: 'Groups::RepositoryStorageMove' do
+    container { association(:group) }
+
+    source_storage_name { 'default' }
+
+    trait :scheduled do
+      state { Groups::RepositoryStorageMove.state_machines[:state].states[:scheduled].value }
+    end
+
+    trait :started do
+      state { Groups::RepositoryStorageMove.state_machines[:state].states[:started].value }
+    end
+
+    trait :replicated do
+      state { Groups::RepositoryStorageMove.state_machines[:state].states[:replicated].value }
+    end
+
+    trait :finished do
+      state { Groups::RepositoryStorageMove.state_machines[:state].states[:finished].value }
+    end
+
+    trait :failed do
+      state { Groups::RepositoryStorageMove.state_machines[:state].states[:failed].value }
+    end
+  end
+end

ee/spec/models/groups/repository_storage_move_spec.rb

@@ -3,7 +3,10 @@
 require 'spec_helper'
 
 RSpec.describe Groups::RepositoryStorageMove, type: :model do
-  describe 'associations' do
-    it { is_expected.to belong_to(:container).class_name('Group') }
+  it_behaves_like 'handles repository moves', check_worker: false do
+    let_it_be_with_refind(:container) { create(:group) }
+
+    let(:repository_storage_factory_key) { :group_repository_storage_move }
+    let(:error_key) { :group }
   end
 end

spec/support/shared_examples/models/concerns/repository_storage_movable_shared_examples.rb

 # frozen_string_literal: true
 
-RSpec.shared_examples 'handles repository moves' do
+RSpec.shared_examples 'handles repository moves' do |check_worker: true|
   describe 'associations' do
     it { is_expected.to belong_to(:container) }
   end
@@ -33,7 +33,7 @@ RSpec.shared_examples 'handles repository moves' do
       subject { build(repository_storage_factory_key, container: container) }
 
       it "does not allow the container to be read-only on create" do
-        container.update!(repository_read_only: true)
+        container.set_repository_read_only!
 
         expect(subject).not_to be_valid
         expect(subject.errors[error_key].first).to match(/is read only/)
@@ -61,6 +61,7 @@ RSpec.shared_examples 'handles repository moves' do
     context 'when in the default state' do
       subject(:storage_move) { create(repository_storage_factory_key, container: container, destination_storage_name: 'test_second_storage') }
 
+      if check_worker
         context 'and transits to scheduled' do
           it 'triggers the corresponding repository storage worker' do
             expect(repository_storage_worker).to receive(:perform_async).with(container.id, 'test_second_storage', storage_move.id)
@@ -81,6 +82,7 @@ RSpec.shared_examples 'handles repository moves' do
             end
           end
         end
+      end
 
       context 'and transits to started' do
         it 'does not allow the transition' do

spec/tasks/gitlab/pages_rake_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rake_helper'
 
-RSpec.describe 'gitlab:pages:migrate_legacy_storagerake task' do
+RSpec.describe 'gitlab:pages:migrate_legacy_storagerake task', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/300123' do
   before(:context) do
     Rake.application.rake_require 'tasks/gitlab/pages'
   end