diff --git a/.gitlab/ci/browser-integration/otrs_chrome.yml b/.gitlab/ci/browser-integration/otrs_chrome.yml index fb8d230b4..06a70fa5c 100644 --- a/.gitlab/ci/browser-integration/otrs_chrome.yml +++ b/.gitlab/ci/browser-integration/otrs_chrome.yml @@ -2,4 +2,16 @@ otrs_chrome: extends: - .template_browser-integration_import variables: - TEST_FILE: "test/integration/otrs_import_browser_test.rb" \ No newline at end of file + TEST_FILE: "test/integration/otrs_import_browser_test.rb" + FF_NETWORK_PER_BUILD: 1 # https://docs.gitlab.com/runner/configuration/feature-flags.html + IMPORT_OTRS_ENDPOINT: "http://zammad-ci-otrsimport-app/otrs/public.pl?Action=ZammadMigrator" + TZ: "Europe/Berlin" # Required for the zammad-ci-otrsimport-app containers + services: + - name: registry.znuny.com/docker/zammad-postgresql:stable + alias: postgresql + - name: registry.znuny.com/docker/zammad-selenium:stable + alias: selenium + - name: registry.znuny.com/docker/zammad-ci-otrsimport-db:otrs6 + alias: zammad-ci-otrsimport-db + - name: registry.znuny.com/docker/zammad-ci-otrsimport-app:otrs6 + alias: zammad-ci-otrsimport-app diff --git a/test/integration/otrs_import_browser_test.rb b/test/integration/otrs_import_browser_test.rb index d71093071..f8f581c38 100644 --- a/test/integration/otrs_import_browser_test.rb +++ b/test/integration/otrs_import_browser_test.rb @@ -5,13 +5,15 @@ require 'browser_test_helper' class OtrsImportBrowserTest < TestCase def test_import - if !ENV['IMPORT_BT_OTRS_ENDPOINT'] - raise "ERROR: Need IMPORT_BT_OTRS_ENDPOINT - hint IMPORT_BT_OTRS_ENDPOINT='http://vz305.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator'" + if !ENV['IMPORT_OTRS_ENDPOINT'] + raise "ERROR: Need IMPORT_OTRS_ENDPOINT - hint IMPORT_OTRS_ENDPOINT='http://vz305.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator'" end - if !ENV['IMPORT_BT_OTRS_ENDPOINT_KEY'] - raise "ERROR: Need IMPORT_BT_OTRS_ENDPOINT_KEY - hint IMPORT_BT_OTRS_ENDPOINT_KEY='01234567899876543210'" + if !ENV['IMPORT_OTRS_ENDPOINT_KEY'] + raise "ERROR: Need IMPORT_OTRS_ENDPOINT_KEY - hint IMPORT_OTRS_ENDPOINT_KEY='01234567899876543210'" end + puts "Using endpoint '#{ENV['IMPORT_OTRS_ENDPOINT']}'." + @browser = browser_instance location(url: browser_url) @@ -20,7 +22,7 @@ class OtrsImportBrowserTest < TestCase click(css: '.js-download') click(css: '.js-otrs-link') - invalid_key_url = "#{ENV['IMPORT_BT_OTRS_ENDPOINT']};Key=31337" + invalid_key_url = "#{ENV['IMPORT_OTRS_ENDPOINT']};Key=31337" set( css: '#otrs-link', @@ -33,7 +35,7 @@ class OtrsImportBrowserTest < TestCase value: 'Invalid API key.', ) - import_url = "#{ENV['IMPORT_BT_OTRS_ENDPOINT']};Key=#{ENV['IMPORT_BT_OTRS_ENDPOINT_KEY']}" + import_url = "#{ENV['IMPORT_OTRS_ENDPOINT']};Key=#{ENV['IMPORT_OTRS_ENDPOINT_KEY']}" set( css: '#otrs-link', value: import_url