From 415ca2dfbc1ab19eaa52f2250ce49b4f90a34a19 Mon Sep 17 00:00:00 2001 From: Jorik Kraaikamp Date: Thu, 13 Jul 2017 16:35:45 +0200 Subject: [PATCH 1/3] Added sauce testing --- karma.conf.js | 73 ++++++++++++++++++++++++++++----------------------- package.json | 1 + 2 files changed, 41 insertions(+), 33 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index f870ec6..3017c68 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -19,12 +19,38 @@ webpackConfig.externals = []; // The main configuration module.exports = function(config) { - config.set({ - browserStack: { - username: '', - accessKey: '' + if (!process.env.SAUCE_USERNAME || !process.env.SAUCE_ACCESS_KEY) { + console.log('Make sure the SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are set.') + process.exit(1) + } + + var customLaunchers = { + sl_chrome: { + base: 'SauceLabs', + browserName: 'chrome', + platform: 'Windows 7', + version: '35' }, + sl_firefox: { + base: 'SauceLabs', + browserName: 'firefox', + version: '30' + }, + sl_ios_safari: { + base: 'SauceLabs', + browserName: 'iphone', + platform: 'OS X 10.9', + version: '7.1' + }, + sl_ie_11: { + base: 'SauceLabs', + browserName: 'internet explorer', + platform: 'Windows 8.1', + version: '11' + } + } + config.set({ frameworks: [ 'jasmine-jquery', 'jasmine-ajax', @@ -53,36 +79,17 @@ module.exports = function(config) { webpackMiddleware: { noInfo: true }, - + colors: true, + recordScreenshots: false, reporters: (process.env.TRAVIS) ? ['spec', 'coverage', 'coveralls'] : ['spec', 'coverage'], - // customLaunchers: { - // edge14: { - // base: 'BrowserStack', - // browser: 'edge', - // browser_version: '14', - // os: 'Windows', - // os_version: '10' - // }, - - // edge15: { - // base: 'BrowserStack', - // browser: 'edge', - // browser_version: '15', - // os: 'Windows', - // os_version: '10' - // }, - - // ie11: { - // base: 'BrowserStack', - // browser: 'ie', - // browser_version: '11', - // os: 'Windows', - // os_version: '7' - // } - // }, - - // browsers: ['Chrome', 'Firefox', 'edge14', 'edge15', 'ie11'] - browsers: ['Chrome', 'Firefox'] + sauceLabs: { + testName: 'Dual listbox browser testing', + public: 'public' + }, + customLaunchers: customLaunchers, + captureTimeout: 120000, + browsers: Object.keys(customLaunchers), + singleRun: true }); } diff --git a/package.json b/package.json index ee45364..cfd46ed 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "karma-jasmine": "^1.0.2", "karma-jasmine-ajax": "^0.1.13", "karma-jasmine-jquery": "^0.1.1", + "karma-sauce-launcher": "^1.1.0", "karma-spec-reporter": "^0.0.26", "karma-webpack": "^1.7.0", "node-sass": "^3.9.3", From bb921ef619f7c72f8d0984725fb808792ff24be6 Mon Sep 17 00:00:00 2001 From: Jorik Kraaikamp Date: Thu, 13 Jul 2017 16:42:10 +0200 Subject: [PATCH 2/3] removed iphone --- karma.conf.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 3017c68..7b2171f 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -36,12 +36,6 @@ module.exports = function(config) { browserName: 'firefox', version: '30' }, - sl_ios_safari: { - base: 'SauceLabs', - browserName: 'iphone', - platform: 'OS X 10.9', - version: '7.1' - }, sl_ie_11: { base: 'SauceLabs', browserName: 'internet explorer', From 4ed913aa285cf1631a8a37bed8a789115ceea77e Mon Sep 17 00:00:00 2001 From: Jorik Kraaikamp Date: Thu, 13 Jul 2017 16:54:30 +0200 Subject: [PATCH 3/3] Added sauselab badge --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b88c58a..dda631c 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ [![NPM](https://nodei.co/npm/dual-listbox.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/dual-listbox/) +[![Sauce Test Status](https://saucelabs.com/browser-matrix/jostcrow.svg)](https://saucelabs.com/u/jostcrow) + # Dual Listbox > Make your multi select pretty and easy to use with only javascript.