diff --git a/app/assets/javascripts/app/controllers/import_otrs.coffee b/app/assets/javascripts/app/controllers/import_otrs.coffee index 2d04674a5..887737c97 100644 --- a/app/assets/javascripts/app/controllers/import_otrs.coffee +++ b/app/assets/javascripts/app/controllers/import_otrs.coffee @@ -18,6 +18,12 @@ class Index extends App.ControllerContent @fetch() + @bind('import:finished', => + console.log('import:finished') + @Config.set('system_init_done', true) + @navigate '#' + ) + fetch: -> # get data @@ -79,7 +85,6 @@ class Index extends App.ControllerContent success: (data, status, xhr) => # validate form - console.log(data) if data.result is 'ok' @urlStatus.attr('data-state', 'success') @linkErrorMessage.text('') @@ -103,7 +108,6 @@ class Index extends App.ControllerContent success: (data, status, xhr) => # validate form - console.log(data) if data.result is 'ok' @delay( @updateMigration, 3000 ) ) diff --git a/lib/import/otrs.rb b/lib/import/otrs.rb index 98c9cd80b..0ec12c2ba 100644 --- a/lib/import/otrs.rb +++ b/lib/import/otrs.rb @@ -412,6 +412,11 @@ module Import::OTRS Setting.set('system_init_done', true) Setting.set('import_mode', false) + # broadcast import finish + Sessions.broadcast( + event: 'import:finished', + ) + true end diff --git a/test/integration/otrs_import_browser_test.rb b/test/integration/otrs_import_browser_test.rb index d7e386a1f..3bbcf81e6 100644 --- a/test/integration/otrs_import_browser_test.rb +++ b/test/integration/otrs_import_browser_test.rb @@ -20,9 +20,9 @@ class OtrsImportBrowserTest < TestCase click(css: 'a[href="#import/otrs"]') - click(css: 'a.js-download') + click(css: '.js-download') - click(css: 'a.js-otrs-link') + click(css: '.js-otrs-link') set( css: '#otrs-link', @@ -33,24 +33,14 @@ class OtrsImportBrowserTest < TestCase css: 'svg.icon-checkmark' ) - click(css: 'a.js-migration-start') + click(css: '.js-migration-start') watch_for( css: 'body', - value: 'xxxx', - timeout: 10, + value: 'login', + timeout: 300, ) - # click import - - # click otrs - - # enter otrs url + key - - # watch for import start - - # watch for import end - end end