Merge branch 'sh-fix-github-lfs-import' into 'master'

Fix import of LFS files in GitHub import See merge request !48722

Merge branch 'sh-fix-github-lfs-import' into 'master'
b79ebe40 · Stan Hu · fe826fc3 · 85920e7c · b79ebe40 · b79ebe40
Commit b79ebe40 authored 4 years ago by Stan Hu
--- a/changelogs/unreleased/sh-fix-github-lfs-import.yml
+++ b/changelogs/unreleased/sh-fix-github-lfs-import.yml
+---
+title: Fix import of LFS files in GitHub import
+merge_request: 48722
+author:
+type: fixed
--- a/lib/gitlab/github_import/importer/lfs_objects_importer.rb
+++ b/lib/gitlab/github_import/importer/lfs_objects_importer.rb
@@ -23,7 +23,7 @@ def collection_method
        end

        def each_object_to_import
-          lfs_objects = Projects::LfsPointers::LfsImportService.new(project).execute
+          lfs_objects = Projects::LfsPointers::LfsObjectDownloadListService.new(project).execute

          lfs_objects.each do |object|
            yield object

--- a/spec/lib/gitlab/github_import/importer/lfs_objects_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/lfs_objects_importer_spec.rb
@@ -56,9 +56,9 @@
      importer = described_class.new(project, client, parallel: false)
      lfs_object_importer = double(:lfs_object_importer)

-      allow(importer)
-        .to receive(:each_object_to_import)
-        .and_yield(lfs_download_object)
+      expect_next_instance_of(Projects::LfsPointers::LfsObjectDownloadListService) do |service|
+        expect(service).to receive(:execute).and_return([lfs_download_object])
+      end

      expect(Gitlab::GithubImport::Importer::LfsObjectImporter)
        .to receive(:new)
@@ -79,9 +79,9 @@
    it 'imports each lfs object in parallel' do
      importer = described_class.new(project, client)

-      allow(importer)
-        .to receive(:each_object_to_import)
-        .and_yield(lfs_download_object)
+      expect_next_instance_of(Projects::LfsPointers::LfsObjectDownloadListService) do |service|
+        expect(service).to receive(:execute).and_return([lfs_download_object])
+      end

      expect(Gitlab::GithubImport::ImportLfsObjectWorker)
        .to receive(:perform_async)