Merge branch 'add-lfs-blob-ids-to-tree-type' into 'master'

Add LFS blob IDs to GraphQL tree type

See merge request gitlab-org/gitlab-ce!28666

4 files changed, 39 insertions, 1 deletions

diff --git a/spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap b/spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap
index 1b4564303e4..86bfde1a28c 100644
--- a/spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap
+++ b/spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap
@@ -22,6 +22,8 @@ exports[`Repository table row component renders table row 1`] = `
     </a>
      
     <!---->
+     
+    <!---->
   </td>
    
   <td
diff --git a/spec/frontend/repository/components/table/row_spec.js b/spec/frontend/repository/components/table/row_spec.js
index a70dc7bb866..90a502966ad 100644
--- a/spec/frontend/repository/components/table/row_spec.js
+++ b/spec/frontend/repository/components/table/row_spec.js
@@ -1,4 +1,5 @@
 import { shallowMount, RouterLinkStub } from '@vue/test-utils';
+import { GlBadge } from '@gitlab/ui';
 import TableRow from '~/repository/components/table/row.vue';
 
 let vm;
@@ -98,4 +99,16 @@ describe('Repository table row component', () => {
 
     expect(vm.find('a').attributes('href')).toEqual('https://test.com');
   });
+
+  it('renders LFS badge', () => {
+    factory({
+      id: '1',
+      path: 'test',
+      type: 'commit',
+      currentPath: '/',
+      lfsOid: '1',
+    });
+
+    expect(vm.find(GlBadge).exists()).toBe(true);
+  });
 });
diff --git a/spec/graphql/types/tree/blob_type_spec.rb b/spec/graphql/types/tree/blob_type_spec.rb
index b12e214ca84..22c11aff90a 100644
--- a/spec/graphql/types/tree/blob_type_spec.rb
+++ b/spec/graphql/types/tree/blob_type_spec.rb
@@ -5,5 +5,5 @@ require 'spec_helper'
 describe Types::Tree::BlobType do
   it { expect(described_class.graphql_name).to eq('Blob') }
 
-  it { expect(described_class).to have_graphql_fields(:id, :name, :type, :path, :flat_path, :web_url) }
+  it { expect(described_class).to have_graphql_fields(:id, :name, :type, :path, :flat_path, :web_url, :lfs_oid) }
 end
diff --git a/spec/lib/gitlab/graphql/loaders/batch_commit_loader_spec.rb b/spec/lib/gitlab/graphql/loaders/batch_commit_loader_spec.rb
new file mode 100644
index 00000000000..0137b1029cd
--- /dev/null
+++ b/spec/lib/gitlab/graphql/loaders/batch_commit_loader_spec.rb
@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Gitlab::Graphql::Loaders::BatchCommitLoader do
+  include GraphqlHelpers
+
+  set(:project) { create(:project, :repository) }
+  let(:repository) { project.repository }
+  let(:blob) { Gitlab::Graphql::Representation::TreeEntry.new(repository.blob_at('master', 'files/lfs/lfs_object.iso'), repository) }
+  let(:otherblob) { Gitlab::Graphql::Representation::TreeEntry.new(repository.blob_at('master', 'README'), repository) }
+
+  describe '#find' do
+    it 'batch-resolves LFS blob IDs' do
+      expect(Gitlab::Git::Blob).to receive(:batch_lfs_pointers).once.and_call_original
+
+      result = batch do
+        [blob, otherblob].map { |b| described_class.new(repository, b.id).find }
+      end
+
+      expect(result.first).to eq(blob.lfs_oid)
+      expect(result.last).to eq(nil)
+    end
+  end
+end