diff --git a/karma.conf.js b/karma.conf.js index 29b3a74..78b4e68 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -15,12 +15,6 @@ module.exports = (config) => { pattern: config.grep ? config.grep : 'test/**/*.test.js', type: 'module' }, - { - pattern: require.resolve('chai/chai.js') - }, - { - pattern: require.resolve('axe-core/axe.min.js') - } ], // see the karma-esm docs for all options diff --git a/karma.sl.config.js b/karma.sl.config.js index 0f310c9..70b2605 100644 --- a/karma.sl.config.js +++ b/karma.sl.config.js @@ -1,32 +1,29 @@ /* eslint-disable import/no-extraneous-dependencies */ const merge = require('deepmerge'); -const slSettings = require('@advanced-rest-client/testing-karma-sl/sl-settings.js'); +const { slSettings } = require('@advanced-rest-client/testing-karma-sl'); const createBaseConfig = require('./karma.conf.js'); module.exports = (config) => { - const cnf = slSettings(); - cnf.sauceLabs.testName = 'import-panel'; - cnf.browsers = [ + const slConfig = merge(slSettings(config), { + sauceLabs: { + testName: 'arc-request-workspace', + }, + // client: { + // mocha: { + // timeout : 6000 + // } + // } + }); + // if you want to change default browsers + slConfig.browsers = [ 'SL_Chrome', 'SL_Chrome-1', 'SL_Firefox', 'SL_Firefox-1', 'SL_Safari', + 'SL_Safari-1', // 'SL_EDGE' ]; - if (process.env.TRAVIS) { - const buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')'; - - cnf.browserStack = { - build: buildLabel, - tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER - }; - - cnf.sauceLabs.build = buildLabel; - cnf.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER; - } - - config.set(merge(createBaseConfig(config), cnf)); - + config.set(merge(createBaseConfig(config), slConfig)); return config; };