summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-06-29 11:41:19 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-06-29 11:41:19 +0200
commitaf2f2dc5ed588d33919d5db3f684c165d7427ab7 (patch)
tree4421eb0512d2bc4741a7d7af638dc10775b3ac64 /spec
parent187dd1005cd92c530146d7f5b0a89b368b09c3e9 (diff)
downloadgitlab-ce-af2f2dc5ed588d33919d5db3f684c165d7427ab7.tar.gz
Make it possible to schedule bg migrations in bulk
Diffstat (limited to 'spec')
-rw-r--r--spec/support/sidekiq.rb8
-rw-r--r--spec/workers/background_migration_worker_spec.rb33
2 files changed, 39 insertions, 2 deletions
diff --git a/spec/support/sidekiq.rb b/spec/support/sidekiq.rb
index 575d3451150..f3819ed2353 100644
--- a/spec/support/sidekiq.rb
+++ b/spec/support/sidekiq.rb
@@ -1,5 +1,11 @@
-require 'sidekiq/testing/inline'
+require 'sidekiq/testing'
Sidekiq::Testing.server_middleware do |chain|
chain.add Gitlab::SidekiqStatus::ServerMiddleware
end
+
+RSpec.configure do |config|
+ config.after(:each, :sidekiq) do
+ Sidekiq::Worker.clear_all
+ end
+end
diff --git a/spec/workers/background_migration_worker_spec.rb b/spec/workers/background_migration_worker_spec.rb
index 85939429feb..4f6e3474634 100644
--- a/spec/workers/background_migration_worker_spec.rb
+++ b/spec/workers/background_migration_worker_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe BackgroundMigrationWorker do
+describe BackgroundMigrationWorker, :sidekiq do
describe '.perform' do
it 'performs a background migration' do
expect(Gitlab::BackgroundMigration)
@@ -10,4 +10,35 @@ describe BackgroundMigrationWorker do
described_class.new.perform('Foo', [10, 20])
end
end
+
+ describe '.perform_bulk' do
+ it 'enqueues background migrations in bulk' do
+ Sidekiq::Testing.fake! do
+ described_class.perform_bulk([['Foo', [1]], ['Foo', [2]]])
+
+ expect(described_class.jobs.count).to eq 2
+ expect(described_class.jobs).to all(include('enqueued_at'))
+ end
+ end
+ end
+
+ describe '.perform_bulk_in' do
+ context 'when delay is valid' do
+ it 'correctly schedules background migrations' do
+ Sidekiq::Testing.fake! do
+ described_class.perform_bulk_in(1.minute, [['Foo', [1]], ['Foo', [2]]])
+
+ expect(described_class.jobs.count).to eq 2
+ expect(described_class.jobs).to all(include('at'))
+ end
+ end
+ end
+
+ context 'when delay is invalid' do
+ it 'raises an ArgumentError exception' do
+ expect { described_class.perform_bulk_in(-60, [['Foo']]) }
+ .to raise_error(ArgumentError)
+ end
+ end
+ end
end