summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Shushlin <vshushlin@gitlab.com>2019-05-20 08:44:20 +0000
committerNick Thomas <nick@gitlab.com>2019-05-20 08:44:20 +0000
commit6bec8cbdebdf598285aaf91440a6992a43d26927 (patch)
treeb0711f76b41f4343a7a98369d780e59ee2a7d849
parent5666c8eb0cfc0f9f48bcab59c88e8a6b6bef84ff (diff)
downloadgitlab-ce-6bec8cbdebdf598285aaf91440a6992a43d26927.tar.gz
Remove remove_disabled_domains feature flag
-rw-r--r--app/workers/pages_domain_removal_cron_worker.rb2
-rw-r--r--spec/workers/pages_domain_removal_cron_worker_spec.rb15
2 files changed, 0 insertions, 17 deletions
diff --git a/app/workers/pages_domain_removal_cron_worker.rb b/app/workers/pages_domain_removal_cron_worker.rb
index 3aca123e5ac..79f38e1b89f 100644
--- a/app/workers/pages_domain_removal_cron_worker.rb
+++ b/app/workers/pages_domain_removal_cron_worker.rb
@@ -5,8 +5,6 @@ class PagesDomainRemovalCronWorker
include CronjobQueue
def perform
- return unless Feature.enabled?(:remove_disabled_domains)
-
PagesDomain.for_removal.find_each do |domain|
domain.destroy!
rescue => e
diff --git a/spec/workers/pages_domain_removal_cron_worker_spec.rb b/spec/workers/pages_domain_removal_cron_worker_spec.rb
index 0e1171e8491..2408ad54189 100644
--- a/spec/workers/pages_domain_removal_cron_worker_spec.rb
+++ b/spec/workers/pages_domain_removal_cron_worker_spec.rb
@@ -9,25 +9,10 @@ describe PagesDomainRemovalCronWorker do
context 'when there is domain which should be removed' do
let!(:domain_for_removal) { create(:pages_domain, :should_be_removed) }
- before do
- stub_feature_flags(remove_disabled_domains: true)
- end
-
it 'removes domain' do
expect { worker.perform }.to change { PagesDomain.count }.by(-1)
expect(PagesDomain.exists?).to eq(false)
end
-
- context 'when domain removal is disabled' do
- before do
- stub_feature_flags(remove_disabled_domains: false)
- end
-
- it 'does not remove pages domain' do
- expect { worker.perform }.not_to change { PagesDomain.count }
- expect(PagesDomain.find_by(domain: domain_for_removal.domain)).to be_present
- end
- end
end
context 'where there is a domain which scheduled for removal in the future' do