Refactor spec for Geo::AttachmentRegistryFinder

Since we made Foreign Data Wrapper (FDW) a hard requirement for
Geo on GitLab 12.0 we don't need to test the scenarios when the
feature flag is disabled.

ee/spec/finders/geo/attachment_registry_finder_spec.rb

@@ -4,9 +4,9 @@ describe Geo::AttachmentRegistryFinder, :geo do
   include ::EE::GeoHelpers
 
   # Using let() instead of set() because set() does not work properly
-  # when using the :delete DatabaseCleaner strategy, which is required for FDW
-  # tests because a foreign table can't see changes inside a transaction of a
-  # different connection.
+  # when using the :delete DatabaseCleaner strategy, which is required
+  # for FDW tests because a foreign table can't see changes inside a
+  # transaction of a different connection.
   let(:secondary) { create(:geo_node) }
 
   let(:synced_group) { create(:group) }
@@ -129,146 +129,6 @@ describe Geo::AttachmentRegistryFinder, :geo do
   end
 
   shared_examples 'counts all the things' do
-    describe '#count_syncable' do
-      let!(:upload_1) { create(:upload, model: synced_group) }
-      let!(:upload_2) { create(:upload, model: unsynced_group) }
-      let!(:upload_3) { create(:upload, :issuable_upload, model: synced_project_in_nested_group) }
-      let!(:upload_4) { create(:upload, model: unsynced_project) }
-      let!(:upload_5) { create(:upload, :personal_snippet_upload) }
-
-      it 'counts attachments' do
-        expect(subject.count_syncable).to eq 5
-      end
-
-      it 'ignores remote attachments' do
-        upload_1.update!(store: ObjectStorage::Store::REMOTE)
-
-        expect(subject.count_syncable).to eq 4
-      end
-
-      context 'with selective sync by namespace' do
-        before do
-          secondary.update!(selective_sync_type: 'namespaces', namespaces: [synced_group])
-        end
-
-        it 'counts attachments' do
-          expect(subject.count_syncable).to eq 3
-        end
-
-        it 'ignores remote attachments' do
-          upload_1.update!(store: ObjectStorage::Store::REMOTE)
-
-          expect(subject.count_syncable).to eq 2
-        end
-      end
-
-      context 'with selective sync by shard' do
-        before do
-          secondary.update!(selective_sync_type: 'shards', selective_sync_shards: ['broken'])
-        end
-
-        it 'counts attachments' do
-          expect(subject.count_syncable).to eq 3
-        end
-
-        it 'ignores remote attachments' do
-          upload_4.update!(store: ObjectStorage::Store::REMOTE)
-
-          expect(subject.count_syncable).to eq 2
-        end
-      end
-    end
-
-    describe '#count_registry' do
-      let!(:upload_1) { create(:upload, model: synced_group) }
-      let!(:upload_2) { create(:upload, model: unsynced_group) }
-      let!(:upload_3) { create(:upload, :issuable_upload, model: synced_project_in_nested_group) }
-      let!(:upload_4) { create(:upload, model: unsynced_project) }
-      let!(:upload_5) { create(:upload, :personal_snippet_upload) }
-      let(:upload_remote_1) { create(:upload, :object_storage, model: synced_project) }
-
-      it 'counts file registries for attachments' do
-        create(:geo_file_registry, :attachment, :failed, file_id: upload_1.id)
-        create(:geo_file_registry, :attachment, file_id: upload_2.id, missing_on_primary: true)
-        create(:geo_file_registry, :attachment, file_id: upload_3.id)
-        create(:geo_file_registry, :attachment, file_id: upload_4.id, missing_on_primary: false)
-        create(:geo_file_registry, :attachment, file_id: upload_5.id)
-
-        expect(subject.count_registry).to eq 5
-      end
-
-      context 'with selective sync by namespace' do
-        before do
-          secondary.update!(selective_sync_type: 'namespaces', namespaces: [synced_group])
-        end
-
-        it 'does not apply the selective sync restriction' do
-          create(:geo_file_registry, :attachment, :failed, file_id: upload_1.id, missing_on_primary: true)
-          create(:geo_file_registry, :attachment, file_id: upload_2.id)
-          create(:geo_file_registry, :attachment, file_id: upload_3.id)
-          create(:geo_file_registry, :attachment, file_id: upload_4.id)
-          create(:geo_file_registry, :attachment, file_id: upload_5.id, missing_on_primary: true)
-
-          expect(subject.count_registry).to eq 5
-        end
-      end
-
-      context 'with selective sync by shard' do
-        before do
-          secondary.update!(selective_sync_type: 'shards', selective_sync_shards: ['broken'])
-        end
-
-        it 'does not apply the selective sync restriction' do
-          create(:geo_file_registry, :attachment, :failed, file_id: upload_1.id)
-          create(:geo_file_registry, :attachment, file_id: upload_2.id, missing_on_primary: true)
-          create(:geo_file_registry, :attachment, file_id: upload_3.id)
-          create(:geo_file_registry, :attachment, file_id: upload_4.id)
-          create(:geo_file_registry, :attachment, file_id: upload_5.id)
-
-          expect(subject.count_registry).to eq 5
-        end
-      end
-    end
-  end
-
-  it 'responds to file registry finder methods' do
-    file_registry_finder_methods = %i{
-      syncable
-      count_syncable
-      count_synced
-      count_failed
-      count_synced_missing_on_primary
-      count_registry
-      find_unsynced
-      find_migrated_local
-      find_retryable_failed_registries
-      find_retryable_synced_missing_on_primary_registries
-    }
-
-    file_registry_finder_methods.each do |method|
-      expect(subject).to respond_to(method)
-    end
-  end
-
-  # Disable transactions via :delete method because a foreign table
-  # can't see changes inside a transaction of a different connection.
-  context 'FDW', :geo_fdw, :delete do
-    context 'with use_fdw_queries_for_selective_sync disabled' do
-      before do
-        stub_feature_flags(use_fdw_queries_for_selective_sync: false)
-      end
-
-      include_examples 'counts all the things'
-      include_examples 'finds all the things'
-    end
-
-    context 'with use_fdw_queries_for_selective_sync enabled' do
-      before do
-        stub_feature_flags(use_fdw_queries_for_selective_sync: true)
-      end
-
-      include_examples 'counts all the things'
-
     describe '#count_synced' do
       let!(:upload_1) { create(:upload, model: synced_group) }
       let!(:upload_2) { create(:upload, model: unsynced_group) }
@@ -494,13 +354,54 @@ describe Geo::AttachmentRegistryFinder, :geo do
       end
     end
 
-      include_examples 'finds all the things'
+    describe '#count_syncable' do
+      let!(:upload_1) { create(:upload, model: synced_group) }
+      let!(:upload_2) { create(:upload, model: unsynced_group) }
+      let!(:upload_3) { create(:upload, :issuable_upload, model: synced_project_in_nested_group) }
+      let!(:upload_4) { create(:upload, model: unsynced_project) }
+      let!(:upload_5) { create(:upload, :personal_snippet_upload) }
+
+      it 'counts attachments' do
+        expect(subject.count_syncable).to eq 5
+      end
+
+      it 'ignores remote attachments' do
+        upload_1.update!(store: ObjectStorage::Store::REMOTE)
+
+        expect(subject.count_syncable).to eq 4
+      end
+
+      context 'with selective sync by namespace' do
+        before do
+          secondary.update!(selective_sync_type: 'namespaces', namespaces: [synced_group])
+        end
+
+        it 'counts attachments' do
+          expect(subject.count_syncable).to eq 3
+        end
+
+        it 'ignores remote attachments' do
+          upload_1.update!(store: ObjectStorage::Store::REMOTE)
+
+          expect(subject.count_syncable).to eq 2
         end
       end
 
-  context 'Legacy' do
+      context 'with selective sync by shard' do
         before do
-      stub_fdw_disabled
+          secondary.update!(selective_sync_type: 'shards', selective_sync_shards: ['broken'])
+        end
+
+        it 'counts attachments' do
+          expect(subject.count_syncable).to eq 3
+        end
+
+        it 'ignores remote attachments' do
+          upload_4.update!(store: ObjectStorage::Store::REMOTE)
+
+          expect(subject.count_syncable).to eq 2
+        end
+      end
     end
 
     describe '#count_registry' do
@@ -554,4 +455,28 @@ describe Geo::AttachmentRegistryFinder, :geo do
       end
     end
   end
+
+  it 'responds to file registry finder methods' do
+    file_registry_finder_methods = %i{
+      syncable
+      count_syncable
+      count_synced
+      count_failed
+      count_synced_missing_on_primary
+      count_registry
+      find_unsynced
+      find_migrated_local
+      find_retryable_failed_registries
+      find_retryable_synced_missing_on_primary_registries
+    }
+
+    file_registry_finder_methods.each do |method|
+      expect(subject).to respond_to(method)
+    end
+  end
+
+  context 'FDW', :geo_fdw do
+    include_examples 'counts all the things'
+    include_examples 'finds all the things'
+  end
 end