Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #3879 - Freshdesk import ends up in Zammad interface without navigation.

Browse source
This commit is contained in:
Dominik Klein 2022-01-05 11:30:04 +01:00
parent 2708704835
commit 20516d6f6e
6 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/import_freshdesk.coffee
View file

@ -164,7 +164,7 @@ class ImportFreshdesk extends App.ControllerWizardFullScreen
@$('.js-error').addClass('hide')
if !_.isEmpty(data.finished_at) && _.isEmpty(data.result['error'])
window.location.reload()
@redirectToLogin()
return
if !_.isEmpty(data.result)

2
app/assets/javascripts/app/controllers/import_kayako.coffee
View file

@ -165,7 +165,7 @@ class ImportKayako extends App.ControllerWizardFullScreen
@$('.js-error').addClass('hide')
if !_.isEmpty(data.finished_at) && _.isEmpty(data.result['error'])
window.location.reload()
@redirectToLogin()
return
if !_.isEmpty(data.result)

2
app/assets/javascripts/app/controllers/import_zendesk.coffee
View file

@ -163,7 +163,7 @@ class ImportZendesk extends App.ControllerWizardFullScreen
@$('.js-error').addClass('hide')
if !_.isEmpty(data.finished_at) && _.isEmpty(data.result['error'])
window.location.reload()
@redirectToLogin()
return
if !_.isEmpty(data.result)

6
spec/system/import/freshdesk_spec.rb
View file

@ -113,6 +113,12 @@ RSpec.describe 'Import Freshdesk', type: :system, set_up: false, authenticated_a
Rake::Task['zammad:setup:auto_wizard'].execute
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

8
spec/system/import/kayako_spec.rb
View file

@ -113,12 +113,18 @@ RSpec.describe 'Import Kayako', type: :system, set_up: false, authenticated_as:
.and(have_css('.js-tickets .js-total', text: '5'))
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
Rake::Task['zammad:setup:auto_wizard'].execute
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

6
spec/system/import/zendesk_spec.rb
View file

@ -122,6 +122,12 @@ RSpec.describe 'Import Zendesk', type: :system, set_up: false, authenticated_as:
Rake::Task['zammad:setup:auto_wizard'].execute
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