Extract background migratons queue class method

2 files changed, 29 insertions, 21 deletions

diff --git a/lib/gitlab/background_migration.rb b/lib/gitlab/background_migration.rb
index d95ecd7b291..6ddffe70da4 100644
--- a/lib/gitlab/background_migration.rb
+++ b/lib/gitlab/background_migration.rb
@@ -1,12 +1,15 @@
 module Gitlab
   module BackgroundMigration
+    def self.queue
+      BackgroundMigrationWorker.sidekiq_options['queue']
+    end
+
     # Begins stealing jobs from the background migrations queue, blocking the
     # caller until all jobs have been completed.
     #
     # steal_class - The name of the class for which to steal jobs.
     def self.steal(steal_class)
-      queue = Sidekiq::Queue
-        .new(BackgroundMigrationWorker.sidekiq_options['queue'])
+      queue = Sidekiq::Queue.new(self.queue)
 
       queue.each do |job|
         migration_class, migration_args = job.args
diff --git a/spec/lib/gitlab/background_migration_spec.rb b/spec/lib/gitlab/background_migration_spec.rb
index 64f82fe27b2..93ffaab65ce 100644
--- a/spec/lib/gitlab/background_migration_spec.rb
+++ b/spec/lib/gitlab/background_migration_spec.rb
@@ -1,33 +1,38 @@
 require 'spec_helper'
 
 describe Gitlab::BackgroundMigration do
-  describe '.steal' do
-    it 'steals jobs from a queue' do
-      queue = [double(:job, args: ['Foo', [10, 20]])]
-
-      allow(Sidekiq::Queue).to receive(:new)
-        .with(BackgroundMigrationWorker.sidekiq_options['queue'])
-        .and_return(queue)
+  describe '.queue' do
+    it 'returns background migration worker queue' do
+      expect(described_class.queue)
+        .to eq BackgroundMigrationWorker.sidekiq_options['queue']
+    end
+  end
 
-      expect(queue[0]).to receive(:delete)
+  describe '.steal' do
+    context 'when there are enqueued jobs present' do
+      let(:queue) { [double(:job, args: ['Foo', [10, 20]])] }
 
-      expect(described_class).to receive(:perform).with('Foo', [10, 20])
+      before do
+        allow(Sidekiq::Queue).to receive(:new)
+          .with(described_class.queue)
+          .and_return(queue)
+      end
 
-      described_class.steal('Foo')
-    end
+      it 'steals jobs from a queue' do
+        expect(queue[0]).to receive(:delete)
 
-    it 'does not steal jobs for a different migration' do
-      queue = [double(:job, args: ['Foo', [10, 20]])]
+        expect(described_class).to receive(:perform).with('Foo', [10, 20])
 
-      allow(Sidekiq::Queue).to receive(:new)
-        .with(BackgroundMigrationWorker.sidekiq_options['queue'])
-        .and_return(queue)
+        described_class.steal('Foo')
+      end
 
-      expect(described_class).not_to receive(:perform)
+      it 'does not steal jobs for a different migration' do
+        expect(described_class).not_to receive(:perform)
 
-      expect(queue[0]).not_to receive(:delete)
+        expect(queue[0]).not_to receive(:delete)
 
-      described_class.steal('Bar')
+        described_class.steal('Bar')
+      end
     end
   end