Merge branch '199985-follow-up-retry-after-import' into 'master'

Follow up for retry after import

Closes #199985

See merge request gitlab-org/gitlab!24281

app/services/projects/after_import_service.rb

@@ -29,11 +29,11 @@ module Projects
     private
 
     def import_failure_service
-      @import_failure_service ||= Gitlab::ImportExport::ImportFailureService.new(@project)
+      Gitlab::ImportExport::ImportFailureService.new(@project)
     end
 
     def repository
-      @repository ||= @project.repository
+      @project.repository
     end
   end
 end

spec/services/projects/after_import_service_spec.rb

@@ -76,12 +76,12 @@ describe Projects::AfterImportService do
       let(:exception) { GRPC::DeadlineExceeded.new }
 
       before do
-        call_count = 0
-
-        allow(repository).to receive(:delete_all_refs_except).and_wrap_original do |original_method, *args|
-          call_count += 1
-          call_count > 1 ? original_method.call(*args) : raise(exception)
-        end
+        expect(repository)
+          .to receive(:delete_all_refs_except)
+          .and_raise(exception)
+        expect(repository)
+          .to receive(:delete_all_refs_except)
+          .and_call_original
 
         subject.execute
       end