Fix import_jid error on project import
This commit is contained in:
parent
1322146bbf
commit
401a3bca40
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix import_jid error on project import
|
||||
merge_request: 25239
|
||||
author:
|
||||
type: fixed
|
|
@ -61,7 +61,7 @@ module Gitlab
|
|||
def log_base_data
|
||||
{
|
||||
importer: 'Import/Export',
|
||||
import_jid: @project&.import_state&.import_jid,
|
||||
import_jid: @project&.import_state&.jid,
|
||||
project_id: @project&.id,
|
||||
project_path: @project&.full_path
|
||||
}
|
||||
|
|
|
@ -14,6 +14,16 @@ describe Gitlab::ImportExport::Shared do
|
|||
expect(subject.errors).to eq(['Error importing into [FILTERED] Permission denied @ unlink_internal - [FILTERED]'])
|
||||
end
|
||||
|
||||
it 'updates the import JID' do
|
||||
import_state = create(:import_state, project: project, jid: 'jid-test')
|
||||
|
||||
expect_next_instance_of(Gitlab::Import::Logger) do |logger|
|
||||
expect(logger).to receive(:error).with(hash_including(import_jid: import_state.jid))
|
||||
end
|
||||
|
||||
subject.error(error)
|
||||
end
|
||||
|
||||
it 'calls the error logger with the full message' do
|
||||
expect(subject).to receive(:log_error).with(hash_including(message: error.message))
|
||||
|
||||
|
|
Loading…
Reference in New Issue