diff options
Diffstat (limited to 'spec/services/pages')
-rw-r--r-- | spec/services/pages/delete_service_spec.rb | 21 | ||||
-rw-r--r-- | spec/services/pages/legacy_storage_lease_spec.rb | 65 | ||||
-rw-r--r-- | spec/services/pages/migrate_legacy_storage_to_deployment_service_spec.rb | 8 |
3 files changed, 0 insertions, 94 deletions
diff --git a/spec/services/pages/delete_service_spec.rb b/spec/services/pages/delete_service_spec.rb index 295abe15bf0..e02e8e72e0b 100644 --- a/spec/services/pages/delete_service_spec.rb +++ b/spec/services/pages/delete_service_spec.rb @@ -12,27 +12,6 @@ RSpec.describe Pages::DeleteService do project.mark_pages_as_deployed end - it 'deletes published pages', :sidekiq_inline do - expect_next_instance_of(Gitlab::PagesTransfer) do |pages_transfer| - expect(pages_transfer).to receive(:rename_project).and_return true - end - - expect(PagesWorker).to receive(:perform_in).with(5.minutes, :remove, project.namespace.full_path, anything) - - service.execute - end - - it "doesn't remove anything from the legacy storage if local_store is disabled", :sidekiq_inline do - allow(Settings.pages.local_store).to receive(:enabled).and_return(false) - - expect(project.pages_deployed?).to be(true) - expect(PagesWorker).not_to receive(:perform_in) - - service.execute - - expect(project.pages_deployed?).to be(false) - end - it 'marks pages as not deployed' do expect do service.execute diff --git a/spec/services/pages/legacy_storage_lease_spec.rb b/spec/services/pages/legacy_storage_lease_spec.rb deleted file mode 100644 index 092dce093ff..00000000000 --- a/spec/services/pages/legacy_storage_lease_spec.rb +++ /dev/null @@ -1,65 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -RSpec.describe ::Pages::LegacyStorageLease do - let(:project) { create(:project) } - - let(:implementation) do - Class.new do - include ::Pages::LegacyStorageLease - - attr_reader :project - - def initialize(project) - @project = project - end - - def execute - try_obtain_lease do - execute_unsafe - end - end - - def execute_unsafe - true - end - end - end - - let(:service) { implementation.new(project) } - - it 'allows method to be executed' do - expect(service).to receive(:execute_unsafe).and_call_original - - expect(service.execute).to eq(true) - end - - context 'when another service holds the lease for the same project' do - around do |example| - implementation.new(project).try_obtain_lease do - example.run - end - end - - it 'does not run guarded method' do - expect(service).not_to receive(:execute_unsafe) - - expect(service.execute).to eq(nil) - end - end - - context 'when another service holds the lease for the different project' do - around do |example| - implementation.new(create(:project)).try_obtain_lease do - example.run - end - end - - it 'allows method to be executed' do - expect(service).to receive(:execute_unsafe).and_call_original - - expect(service.execute).to eq(true) - end - end -end diff --git a/spec/services/pages/migrate_legacy_storage_to_deployment_service_spec.rb b/spec/services/pages/migrate_legacy_storage_to_deployment_service_spec.rb index 25f571a73d1..177467aac85 100644 --- a/spec/services/pages/migrate_legacy_storage_to_deployment_service_spec.rb +++ b/spec/services/pages/migrate_legacy_storage_to_deployment_service_spec.rb @@ -114,13 +114,5 @@ RSpec.describe Pages::MigrateLegacyStorageToDeploymentService do described_class.new(project).execute end.not_to change { project.pages_metadatum.reload.pages_deployment_id }.from(old_deployment.id) end - - it 'raises exception if exclusive lease is taken' do - described_class.new(project).try_obtain_lease do - expect do - described_class.new(project).execute - end.to raise_error(described_class::ExclusiveLeaseTakenError) - end - end end end |