Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 10 deletions

diff --git a/spec/workers/projects/after_import_worker_spec.rb b/spec/workers/projects/after_import_worker_spec.rb
index 332b547bb66..a14b2443173 100644
--- a/spec/workers/projects/after_import_worker_spec.rb
+++ b/spec/workers/projects/after_import_worker_spec.rb
@@ -39,8 +39,7 @@ RSpec.describe Projects::AfterImportWorker do
       end
 
       it 'removes refs/pull/**/*' do
-        expect(rugged.references.map(&:name))
-          .not_to include(%r{\Arefs/pull/})
+        expect(repository.list_refs(['refs/pull/'])).to be_empty
       end
     end
 
@@ -53,8 +52,7 @@ RSpec.describe Projects::AfterImportWorker do
         end
 
         it "does not remove refs/#{name}/tmp" do
-          expect(rugged.references.map(&:name))
-            .to include("refs/#{name}/tmp")
+          expect(repository.list_refs(["refs/#{name}/tmp"]).length).to be(1)
         end
       end
     end
@@ -100,8 +98,7 @@ RSpec.describe Projects::AfterImportWorker do
       it 'removes refs/pull/**/*' do
         subject
 
-        expect(rugged.references.map(&:name))
-          .not_to include(%r{\Arefs/pull/})
+        expect(repository.list_refs(['refs/pull/'])).to be_empty
       end
 
       it 'records the failures in the database', :aggregate_failures do
@@ -123,9 +120,5 @@ RSpec.describe Projects::AfterImportWorker do
         expect(import_failure.correlation_id_value).not_to be_empty
       end
     end
-
-    def rugged
-      rugged_repo(repository)
-    end
   end
 end