Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 11 insertions, 5 deletions

diff --git a/spec/lib/gitlab/bitbucket_server_import/importer_spec.rb b/spec/lib/gitlab/bitbucket_server_import/importer_spec.rb
index f9313f0ff28..0380ddd9a2e 100644
--- a/spec/lib/gitlab/bitbucket_server_import/importer_spec.rb
+++ b/spec/lib/gitlab/bitbucket_server_import/importer_spec.rb
@@ -27,20 +27,26 @@ RSpec.describe Gitlab::BitbucketServerImport::Importer do
   end
 
   describe '#import_repository' do
+    let(:repo_url) { 'http://bitbucket:test@my-bitbucket' }
+
+    before do
+      expect(project.repository).to receive(:import_repository).with(repo_url)
+    end
+
     it 'adds a remote' do
       expect(subject).to receive(:import_pull_requests)
       expect(subject).to receive(:delete_temp_branches)
       expect(project.repository).to receive(:fetch_as_mirror)
-                                     .with('http://bitbucket:test@my-bitbucket',
-                                           refmap: [:heads, :tags, '+refs/pull-requests/*/to:refs/merge-requests/*/head'])
+                                     .with(repo_url,
+                                           refmap: ['+refs/pull-requests/*/to:refs/merge-requests/*/head'])
 
       subject.execute
     end
 
-    it 'raises a Gitlab::Shell exception in the fetch' do
-      expect(project.repository).to receive(:fetch_as_mirror).and_raise(Gitlab::Shell::Error)
+    it 'raises a Gitlab::Git::CommandError in the fetch' do
+      expect(project.repository).to receive(:fetch_as_mirror).and_raise(::Gitlab::Git::CommandError)
 
-      expect { subject.execute }.to raise_error(Gitlab::Shell::Error)
+      expect { subject.execute }.to raise_error(::Gitlab::Git::CommandError)
     end
 
     it 'raises an unhandled exception in the fetch' do