Add latest changes from gitlab-org/gitlab@master

1 files changed, 26 insertions, 0 deletions

diff --git a/spec/lib/gitlab/background_migration_spec.rb b/spec/lib/gitlab/background_migration_spec.rb
index 9546550bfc5..71959f54b38 100644
--- a/spec/lib/gitlab/background_migration_spec.rb
+++ b/spec/lib/gitlab/background_migration_spec.rb
@@ -165,6 +165,32 @@ describe Gitlab::BackgroundMigration do
     end
   end
 
+  describe '.remaining', :redis do
+    context 'when there are jobs remaining' do
+      let(:queue) { Array.new(12) }
+
+      before do
+        allow(Sidekiq::Queue).to receive(:new)
+          .with(described_class.queue)
+          .and_return(Array.new(12))
+
+        Sidekiq::Testing.disable! do
+          BackgroundMigrationWorker.perform_in(10.minutes, 'Foo')
+        end
+      end
+
+      it 'returns the enqueued jobs plus the scheduled jobs' do
+        expect(described_class.remaining).to eq(13)
+      end
+    end
+
+    context 'when there are no jobs remaining' do
+      it 'returns zero' do
+        expect(described_class.remaining).to be_zero
+      end
+    end
+  end
+
   describe '.exists?' do
     context 'when there are enqueued jobs present' do
       let(:queue) do