1 files changed, 50 insertions, 7 deletions

diff --git a/spec/lib/gitlab/database/async_indexes_spec.rb b/spec/lib/gitlab/database/async_indexes_spec.rb
index 8a5509f892f..c6991bf4e06 100644
--- a/spec/lib/gitlab/database/async_indexes_spec.rb
+++ b/spec/lib/gitlab/database/async_indexes_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Database::AsyncIndexes do
+RSpec.describe Gitlab::Database::AsyncIndexes, feature_category: :database do
   describe '.create_pending_indexes!' do
     subject { described_class.create_pending_indexes! }
 
@@ -11,9 +11,9 @@ RSpec.describe Gitlab::Database::AsyncIndexes do
     end
 
     it 'takes 2 pending indexes and creates those' do
-      Gitlab::Database::AsyncIndexes::PostgresAsyncIndex.to_create.order(:id).limit(2).each do |index|
-        creator = double('index creator')
-        expect(Gitlab::Database::AsyncIndexes::IndexCreator).to receive(:new).with(index).and_return(creator)
+      indexes = described_class::PostgresAsyncIndex.to_create.order(:id).limit(2).to_a
+
+      expect_next_instances_of(described_class::IndexCreator, 2, indexes) do |creator|
         expect(creator).to receive(:perform)
       end
 
@@ -29,13 +29,56 @@ RSpec.describe Gitlab::Database::AsyncIndexes do
     end
 
     it 'takes 2 pending indexes and destroys those' do
-      Gitlab::Database::AsyncIndexes::PostgresAsyncIndex.to_drop.order(:id).limit(2).each do |index|
-        destructor = double('index destructor')
-        expect(Gitlab::Database::AsyncIndexes::IndexDestructor).to receive(:new).with(index).and_return(destructor)
+      indexes = described_class::PostgresAsyncIndex.to_drop.order(:id).limit(2).to_a
+
+      expect_next_instances_of(described_class::IndexDestructor, 2, indexes) do |destructor|
         expect(destructor).to receive(:perform)
       end
 
       subject
     end
   end
+
+  describe '.execute_pending_actions!' do
+    subject { described_class.execute_pending_actions!(how_many: how_many) }
+
+    let_it_be(:failed_creation_entry) { create(:postgres_async_index, attempts: 5) }
+    let_it_be(:failed_removal_entry) { create(:postgres_async_index, :with_drop, attempts: 1) }
+    let_it_be(:creation_entry) { create(:postgres_async_index) }
+    let_it_be(:removal_entry) { create(:postgres_async_index, :with_drop) }
+
+    context 'with one entry' do
+      let(:how_many) { 1 }
+
+      it 'executes instructions ordered by attempts and ids' do
+        expect { subject }
+          .to change { queued_entries_exist?(creation_entry) }.to(false)
+          .and change { described_class::PostgresAsyncIndex.count }.by(-how_many)
+      end
+    end
+
+    context 'with two entries' do
+      let(:how_many) { 2 }
+
+      it 'executes instructions ordered by attempts' do
+        expect { subject }
+          .to change { queued_entries_exist?(creation_entry, removal_entry) }.to(false)
+          .and change { described_class::PostgresAsyncIndex.count }.by(-how_many)
+      end
+    end
+
+    context 'when the budget allows more instructions' do
+      let(:how_many) { 3 }
+
+      it 'retries failed attempts' do
+        expect { subject }
+          .to change { queued_entries_exist?(creation_entry, removal_entry, failed_removal_entry) }.to(false)
+          .and change { described_class::PostgresAsyncIndex.count }.by(-how_many)
+      end
+    end
+
+    def queued_entries_exist?(*records)
+      described_class::PostgresAsyncIndex.where(id: records).exists?
+    end
+  end
 end