Commit f69066a2 authored by Stan Hu's avatar Stan Hu Committed by GitLab Release Tools Bot
Browse files

Merge branch '57579-gitlab-project-import-fails-sidekiq-undefined-method-import_jid' into 'master'

Resolve "Gitlab Project import fails: sidekiq undefined method import_jid"

Closes #57579

See merge request gitlab-org/gitlab-ce!25239

(cherry picked from commit c06ebe51)

401a3bca Fix import_jid error on project import
parent 657d5085
---
title: Fix import_jid error on project import
merge_request: 25239
author:
type: fixed
......@@ -61,7 +61,7 @@ def log_debug(details)
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 @@
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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment