Skip to content
This repository has been archived by the owner on Sep 21, 2020. It is now read-only.

Commit

Permalink
test: updating test configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
jarrodek committed Jan 9, 2020
1 parent 287077e commit 9c686a4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 24 deletions.
6 changes: 0 additions & 6 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
33 changes: 15 additions & 18 deletions karma.sl.config.js
Original file line number Diff line number Diff line change
@@ -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;
};

0 comments on commit 9c686a4

Please sign in to comment.