Fixes #3879 - Freshdesk import ends up in Zammad interface without navigation.
This commit is contained in:
parent
2708704835
commit
20516d6f6e
6 changed files with 22 additions and 4 deletions
|
@ -164,7 +164,7 @@ class ImportFreshdesk extends App.ControllerWizardFullScreen
|
||||||
@$('.js-error').addClass('hide')
|
@$('.js-error').addClass('hide')
|
||||||
|
|
||||||
if !_.isEmpty(data.finished_at) && _.isEmpty(data.result['error'])
|
if !_.isEmpty(data.finished_at) && _.isEmpty(data.result['error'])
|
||||||
window.location.reload()
|
@redirectToLogin()
|
||||||
return
|
return
|
||||||
|
|
||||||
if !_.isEmpty(data.result)
|
if !_.isEmpty(data.result)
|
||||||
|
|
|
@ -165,7 +165,7 @@ class ImportKayako extends App.ControllerWizardFullScreen
|
||||||
@$('.js-error').addClass('hide')
|
@$('.js-error').addClass('hide')
|
||||||
|
|
||||||
if !_.isEmpty(data.finished_at) && _.isEmpty(data.result['error'])
|
if !_.isEmpty(data.finished_at) && _.isEmpty(data.result['error'])
|
||||||
window.location.reload()
|
@redirectToLogin()
|
||||||
return
|
return
|
||||||
|
|
||||||
if !_.isEmpty(data.result)
|
if !_.isEmpty(data.result)
|
||||||
|
|
|
@ -163,7 +163,7 @@ class ImportZendesk extends App.ControllerWizardFullScreen
|
||||||
@$('.js-error').addClass('hide')
|
@$('.js-error').addClass('hide')
|
||||||
|
|
||||||
if !_.isEmpty(data.finished_at) && _.isEmpty(data.result['error'])
|
if !_.isEmpty(data.finished_at) && _.isEmpty(data.result['error'])
|
||||||
window.location.reload()
|
@redirectToLogin()
|
||||||
return
|
return
|
||||||
|
|
||||||
if !_.isEmpty(data.result)
|
if !_.isEmpty(data.result)
|
||||||
|
|
|
@ -113,6 +113,12 @@ RSpec.describe 'Import Freshdesk', type: :system, set_up: false, authenticated_a
|
||||||
Rake::Task['zammad:setup:auto_wizard'].execute
|
Rake::Task['zammad:setup:auto_wizard'].execute
|
||||||
|
|
||||||
expect(page).to have_text(Setting.get('fqdn'))
|
expect(page).to have_text(Setting.get('fqdn'))
|
||||||
|
|
||||||
|
# Check that the login is working and also the left navigation side bar is visible.
|
||||||
|
login(
|
||||||
|
username: 'admin@example.com',
|
||||||
|
password: 'test',
|
||||||
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -113,12 +113,18 @@ RSpec.describe 'Import Kayako', type: :system, set_up: false, authenticated_as:
|
||||||
.and(have_css('.js-tickets .js-total', text: '5'))
|
.and(have_css('.js-tickets .js-total', text: '5'))
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'shows login after import is finished' do
|
it 'shows login after import is finished and process login' do
|
||||||
job.update! finished_at: Time.zone.now
|
job.update! finished_at: Time.zone.now
|
||||||
|
|
||||||
Rake::Task['zammad:setup:auto_wizard'].execute
|
Rake::Task['zammad:setup:auto_wizard'].execute
|
||||||
|
|
||||||
expect(page).to have_text(Setting.get('fqdn'))
|
expect(page).to have_text(Setting.get('fqdn'))
|
||||||
|
|
||||||
|
# Check that the login is working and also the left navigation side bar is visible.
|
||||||
|
login(
|
||||||
|
username: 'admin@example.com',
|
||||||
|
password: 'test',
|
||||||
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -122,6 +122,12 @@ RSpec.describe 'Import Zendesk', type: :system, set_up: false, authenticated_as:
|
||||||
Rake::Task['zammad:setup:auto_wizard'].execute
|
Rake::Task['zammad:setup:auto_wizard'].execute
|
||||||
|
|
||||||
expect(page).to have_text(Setting.get('fqdn'))
|
expect(page).to have_text(Setting.get('fqdn'))
|
||||||
|
|
||||||
|
# Check that the login is working and also the left navigation side bar is visible.
|
||||||
|
login(
|
||||||
|
username: 'admin@example.com',
|
||||||
|
password: 'test',
|
||||||
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue