Remove last flags from Blob and Workhorse

2 files changed, 87 insertions, 119 deletions

diff --git a/spec/lib/gitlab/git/blob_spec.rb b/spec/lib/gitlab/git/blob_spec.rb
index 6900c4189b7..034b89a46fa 100644
--- a/spec/lib/gitlab/git/blob_spec.rb
+++ b/spec/lib/gitlab/git/blob_spec.rb
@@ -178,77 +178,67 @@ describe Gitlab::Git::Blob, seed_helper: true do
   end
 
   describe '.batch' do
-    shared_examples 'loading blobs in batch' do
-      let(:blob_references) do
-        [
-          [SeedRepo::Commit::ID, "files/ruby/popen.rb"],
-          [SeedRepo::Commit::ID, 'six']
-        ]
-      end
+    let(:blob_references) do
+      [
+        [SeedRepo::Commit::ID, "files/ruby/popen.rb"],
+        [SeedRepo::Commit::ID, 'six']
+      ]
+    end
 
-      subject { described_class.batch(repository, blob_references) }
+    subject { described_class.batch(repository, blob_references) }
 
-      it { expect(subject.size).to eq(blob_references.size) }
+    it { expect(subject.size).to eq(blob_references.size) }
 
-      context 'first blob' do
-        let(:blob) { subject[0] }
+    context 'first blob' do
+      let(:blob) { subject[0] }
 
-        it { expect(blob.id).to eq(SeedRepo::RubyBlob::ID) }
-        it { expect(blob.name).to eq(SeedRepo::RubyBlob::NAME) }
-        it { expect(blob.path).to eq("files/ruby/popen.rb") }
-        it { expect(blob.commit_id).to eq(SeedRepo::Commit::ID) }
-        it { expect(blob.data[0..10]).to eq(SeedRepo::RubyBlob::CONTENT[0..10]) }
-        it { expect(blob.size).to eq(669) }
-        it { expect(blob.mode).to eq("100644") }
-      end
+      it { expect(blob.id).to eq(SeedRepo::RubyBlob::ID) }
+      it { expect(blob.name).to eq(SeedRepo::RubyBlob::NAME) }
+      it { expect(blob.path).to eq("files/ruby/popen.rb") }
+      it { expect(blob.commit_id).to eq(SeedRepo::Commit::ID) }
+      it { expect(blob.data[0..10]).to eq(SeedRepo::RubyBlob::CONTENT[0..10]) }
+      it { expect(blob.size).to eq(669) }
+      it { expect(blob.mode).to eq("100644") }
+    end
 
-      context 'second blob' do
-        let(:blob) { subject[1] }
+    context 'second blob' do
+      let(:blob) { subject[1] }
 
-        it { expect(blob.id).to eq('409f37c4f05865e4fb208c771485f211a22c4c2d') }
-        it { expect(blob.data).to eq('') }
-        it 'does not mark the blob as binary' do
-          expect(blob).not_to be_binary
-        end
+      it { expect(blob.id).to eq('409f37c4f05865e4fb208c771485f211a22c4c2d') }
+      it { expect(blob.data).to eq('') }
+      it 'does not mark the blob as binary' do
+        expect(blob).not_to be_binary
       end
+    end
 
-      context 'limiting' do
-        subject { described_class.batch(repository, blob_references, blob_size_limit: blob_size_limit) }
+    context 'limiting' do
+      subject { described_class.batch(repository, blob_references, blob_size_limit: blob_size_limit) }
 
-        context 'positive' do
-          let(:blob_size_limit) { 10 }
+      context 'positive' do
+        let(:blob_size_limit) { 10 }
 
-          it { expect(subject.first.data.size).to eq(10) }
-        end
+        it { expect(subject.first.data.size).to eq(10) }
+      end
 
-        context 'zero' do
-          let(:blob_size_limit) { 0 }
+      context 'zero' do
+        let(:blob_size_limit) { 0 }
 
-          it 'only loads the metadata' do
-            expect(subject.first.size).not_to be(0)
-            expect(subject.first.data).to eq('')
-          end
+        it 'only loads the metadata' do
+          expect(subject.first.size).not_to be(0)
+          expect(subject.first.data).to eq('')
         end
+      end
 
-        context 'negative' do
-          let(:blob_size_limit) { -1 }
+      context 'negative' do
+        let(:blob_size_limit) { -1 }
 
-          it 'ignores MAX_DATA_DISPLAY_SIZE' do
-            stub_const('Gitlab::Git::Blob::MAX_DATA_DISPLAY_SIZE', 100)
+        it 'ignores MAX_DATA_DISPLAY_SIZE' do
+          stub_const('Gitlab::Git::Blob::MAX_DATA_DISPLAY_SIZE', 100)
 
-            expect(subject.first.data.size).to eq(669)
-          end
+          expect(subject.first.data.size).to eq(669)
         end
       end
     end
-
-    context 'when Gitaly list_blobs_by_sha_path feature is enabled' do
-      it_behaves_like 'loading blobs in batch'
-    end
-
-    context 'when Gitaly list_blobs_by_sha_path feature is disabled', :disable_gitaly do
-      it_behaves_like 'loading blobs in batch'
-    end
   end
 
   describe '.batch_metadata' do
@@ -294,58 +284,48 @@ describe Gitlab::Git::Blob, seed_helper: true do
       )
     end
 
-    shared_examples 'fetching batch of LFS pointers' do
-      it 'returns a list of Gitlab::Git::Blob' do
-        blobs = described_class.batch_lfs_pointers(repository, [lfs_blob.id])
-
-        expect(blobs.count).to eq(1)
-        expect(blobs).to all( be_a(Gitlab::Git::Blob) )
-        expect(blobs).to be_an(Array)
-      end
-
-      it 'accepts blob IDs as a lazy enumerator' do
-        blobs = described_class.batch_lfs_pointers(repository, [lfs_blob.id].lazy)
-
-        expect(blobs.count).to eq(1)
-        expect(blobs).to all( be_a(Gitlab::Git::Blob) )
-      end
+    it 'returns a list of Gitlab::Git::Blob' do
+      blobs = described_class.batch_lfs_pointers(repository, [lfs_blob.id])
 
-      it 'handles empty list of IDs gracefully' do
-        blobs_1 = described_class.batch_lfs_pointers(repository, [].lazy)
-        blobs_2 = described_class.batch_lfs_pointers(repository, [])
+      expect(blobs.count).to eq(1)
+      expect(blobs).to all( be_a(Gitlab::Git::Blob) )
+      expect(blobs).to be_an(Array)
+    end
 
-        expect(blobs_1).to eq([])
-        expect(blobs_2).to eq([])
-      end
+    it 'accepts blob IDs as a lazy enumerator' do
+      blobs = described_class.batch_lfs_pointers(repository, [lfs_blob.id].lazy)
 
-      it 'silently ignores tree objects' do
-        blobs = described_class.batch_lfs_pointers(repository, [tree_object.oid])
+      expect(blobs.count).to eq(1)
+      expect(blobs).to all( be_a(Gitlab::Git::Blob) )
+    end
 
-        expect(blobs).to eq([])
-      end
+    it 'handles empty list of IDs gracefully' do
+      blobs_1 = described_class.batch_lfs_pointers(repository, [].lazy)
+      blobs_2 = described_class.batch_lfs_pointers(repository, [])
 
-      it 'silently ignores non lfs objects' do
-        blobs = described_class.batch_lfs_pointers(repository, [non_lfs_blob.id])
+      expect(blobs_1).to eq([])
+      expect(blobs_2).to eq([])
+    end
 
-        expect(blobs).to eq([])
-      end
+    it 'silently ignores tree objects' do
+      blobs = described_class.batch_lfs_pointers(repository, [tree_object.oid])
 
-      it 'avoids loading large blobs into memory' do
-        # This line could call `lookup` on `repository`, so do here before mocking.
-        non_lfs_blob_id = non_lfs_blob.id
+      expect(blobs).to eq([])
+    end
 
-        expect(repository).not_to receive(:lookup)
+    it 'silently ignores non lfs objects' do
+      blobs = described_class.batch_lfs_pointers(repository, [non_lfs_blob.id])
 
-        described_class.batch_lfs_pointers(repository, [non_lfs_blob_id])
-      end
+      expect(blobs).to eq([])
     end
 
-    context 'when Gitaly batch_lfs_pointers is enabled' do
-      it_behaves_like 'fetching batch of LFS pointers'
-    end
+    it 'avoids loading large blobs into memory' do
+      # This line could call `lookup` on `repository`, so do here before mocking.
+      non_lfs_blob_id = non_lfs_blob.id
+
+      expect(repository).not_to receive(:lookup)
 
-    context 'when Gitaly batch_lfs_pointers is disabled', :disable_gitaly do
-      it_behaves_like 'fetching batch of LFS pointers'
+      described_class.batch_lfs_pointers(repository, [non_lfs_blob_id])
     end
   end
 
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index 98a1865d347..23869f3d2da 100644
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -68,34 +68,22 @@ describe Gitlab::Workhorse do
     let(:diff_refs) { double(base_sha: "base", head_sha: "head") }
     subject { described_class.send_git_patch(repository, diff_refs) }
 
-    context 'when Gitaly workhorse_send_git_patch feature is enabled' do
-      it 'sets the header correctly' do
-        key, command, params = decode_workhorse_header(subject)
-
-        expect(key).to eq("Gitlab-Workhorse-Send-Data")
-        expect(command).to eq("git-format-patch")
-        expect(params).to eq({
-          'GitalyServer' => {
-            address: Gitlab::GitalyClient.address(project.repository_storage),
-            token: Gitlab::GitalyClient.token(project.repository_storage)
-          },
-          'RawPatchRequest' => Gitaly::RawPatchRequest.new(
-            repository: repository.gitaly_repository,
-            left_commit_id: 'base',
-            right_commit_id: 'head'
-          ).to_json
-        }.deep_stringify_keys)
-      end
-    end
-
-    context 'when Gitaly workhorse_send_git_patch feature is disabled', :disable_gitaly do
-      it 'sets the header correctly' do
-        key, command, params = decode_workhorse_header(subject)
+    it 'sets the header correctly' do
+      key, command, params = decode_workhorse_header(subject)
 
-        expect(key).to eq("Gitlab-Workhorse-Send-Data")
-        expect(command).to eq("git-format-patch")
-        expect(params).to eq("RepoPath" => repository.path_to_repo, "ShaFrom" => "base", "ShaTo" => "head")
-      end
+      expect(key).to eq("Gitlab-Workhorse-Send-Data")
+      expect(command).to eq("git-format-patch")
+      expect(params).to eq({
+        'GitalyServer' => {
+          address: Gitlab::GitalyClient.address(project.repository_storage),
+          token: Gitlab::GitalyClient.token(project.repository_storage)
+        },
+        'RawPatchRequest' => Gitaly::RawPatchRequest.new(
+          repository: repository.gitaly_repository,
+          left_commit_id: 'base',
+          right_commit_id: 'head'
+        ).to_json
+      }.deep_stringify_keys)
     end
   end