From 415ca2dfbc1ab19eaa52f2250ce49b4f90a34a19 Mon Sep 17 00:00:00 2001 From: Jorik Kraaikamp Date: Thu, 13 Jul 2017 16:35:45 +0200 Subject: [PATCH 01/10] 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 02/10] 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 03/10] 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. From 5a891b9f9600de8f6b519e7f58ad094130d1894f Mon Sep 17 00:00:00 2001 From: Jorik Kraaikamp Date: Thu, 13 Jul 2017 17:37:10 +0200 Subject: [PATCH 04/10] Removed browserstack testing dep --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index cfd46ed..2fae3fe 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "jasmine-core": "^2.4.1", "jshint": "^2.9.2", "karma": "^1.1.0", - "karma-browserstack-launcher": "^1.2.0", "karma-chrome-launcher": "^1.0.1", "karma-coverage": "^1.0.0", "karma-coveralls": "^1.1.2", From 9326749604ed0fa02a534bb86d22888394d0f460 Mon Sep 17 00:00:00 2001 From: Jorik Kraaikamp Date: Thu, 13 Jul 2017 17:47:01 +0200 Subject: [PATCH 05/10] also report to saucelabs --- karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karma.conf.js b/karma.conf.js index 7b2171f..03dc189 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -75,7 +75,7 @@ module.exports = function(config) { }, colors: true, recordScreenshots: false, - reporters: (process.env.TRAVIS) ? ['spec', 'coverage', 'coveralls'] : ['spec', 'coverage'], + reporters: (process.env.TRAVIS) ? ['spec', 'coverage', 'coveralls', 'saucelabs'] : ['spec', 'coverage', 'saucelabs'], sauceLabs: { testName: 'Dual listbox browser testing', From cc75026831fed8258d8f796f4a20b9e060d76b5a Mon Sep 17 00:00:00 2001 From: Jorik Kraaikamp Date: Mon, 17 Jul 2017 11:05:34 +0200 Subject: [PATCH 06/10] Added a check if using CI --- karma.conf.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 03dc189..c15612e 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -17,11 +17,16 @@ webpackConfig.plugins = []; webpackConfig.externals = []; +function ConfigException(message) { + this.message = message; + this.name = 'ConfigException'; +} + + // The main configuration module.exports = function(config) { - 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) + if (process.env.CI && (!process.env.SAUCE_USERNAME || !process.env.SAUCE_ACCESS_KEY)) { + throw ConfigException('Make sure the SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are set.') } var customLaunchers = { From 8880763e23a145b03996e17846072e83025bbd76 Mon Sep 17 00:00:00 2001 From: Jorik Kraaikamp Date: Mon, 17 Jul 2017 14:20:53 +0200 Subject: [PATCH 07/10] Updated the browsers that are tested --- karma.conf.js | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index c15612e..6c1fbe9 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -34,12 +34,42 @@ module.exports = function(config) { base: 'SauceLabs', browserName: 'chrome', platform: 'Windows 7', - version: '35' + version: '58' + }, + sl_chrome_2: { + base: 'SauceLabs', + browserName: 'chrome', + platform: 'Windows 7', + version: '57' + }, + sl_edge: { + base: 'SauceLabs', + browserName: 'edge', + platform: 'Windows 7', + version: '15' + }, + sl_edge_2: { + base: 'SauceLabs', + browserName: 'edge', + platform: 'Windows 7', + version: '14' + }, + sl_safari: { + base: 'SauceLabs', + browserName: 'safari', + platform: 'macOS 10.12', + version: '10' + }, + sl_safari_2: { + base: 'SauceLabs', + browserName: 'safari', + platform: 'macOS 10.11', + version: '9' }, sl_firefox: { base: 'SauceLabs', browserName: 'firefox', - version: '30' + version: '54' }, sl_ie_11: { base: 'SauceLabs', From f97b9224001003ed10eff78b0dec56d503fcfc04 Mon Sep 17 00:00:00 2001 From: Jorik Kraaikamp Date: Mon, 17 Jul 2017 15:34:49 +0200 Subject: [PATCH 08/10] Updated the testing saucelabs config --- karma.conf.js | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 6c1fbe9..a1e27c8 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -33,42 +33,43 @@ module.exports = function(config) { sl_chrome: { base: 'SauceLabs', browserName: 'chrome', - platform: 'Windows 7', - version: '58' + platform: 'Windows 10', + version: '59.0' }, sl_chrome_2: { base: 'SauceLabs', browserName: 'chrome', - platform: 'Windows 7', - version: '57' + platform: 'Windows 10', + version: '58.0' }, sl_edge: { base: 'SauceLabs', - browserName: 'edge', - platform: 'Windows 7', - version: '15' + browserName: 'MicrosoftEdge', + platform: 'Windows 10', + version: '15.15063' }, sl_edge_2: { base: 'SauceLabs', - browserName: 'edge', - platform: 'Windows 7', - version: '14' + browserName: 'MicrosoftEdge', + platform: 'Windows 10', + version: '14.14393' }, sl_safari: { base: 'SauceLabs', browserName: 'safari', platform: 'macOS 10.12', - version: '10' + version: '10.0' }, sl_safari_2: { base: 'SauceLabs', browserName: 'safari', - platform: 'macOS 10.11', - version: '9' + platform: 'OS X 10.11', + version: '9.0' }, sl_firefox: { base: 'SauceLabs', browserName: 'firefox', + platform: 'Windows 10', version: '54' }, sl_ie_11: { @@ -76,6 +77,25 @@ module.exports = function(config) { browserName: 'internet explorer', platform: 'Windows 8.1', version: '11' + }, + sl_safari_mobile: { + base: 'SauceLabs', + browserName: "Safari", + appiumVersion: "1.6.5", + deviceName: "iPhone Simulator", + deviceOrientation: "portrait", + platformVersion: "10.3", + platformName: "iOS" + }, + sl_chrome_mobile: { + base: 'SauceLabs', + browserName: "Android", + appiumVersion: "1.6.5", + deviceName: "Android Emulator", + deviceOrientation: "portrait", + browserName: "Chrome", + platformVersion: "6.0", + platformName: "Android" } } From 2375f25c9ecdac01d89a5970580dce47d27472d6 Mon Sep 17 00:00:00 2001 From: Sven van de Scheur Date: Wed, 19 Jul 2017 11:07:00 +0200 Subject: [PATCH 09/10] Try with more up to date fork of karma-sauce-launcher. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2fae3fe..b2f5742 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,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-sauce-launcher": "git+https://github.com/danielkalen/karma-sauce-launcher.git", "karma-spec-reporter": "^0.0.26", "karma-webpack": "^1.7.0", "node-sass": "^3.9.3", From 7a2554e342c834e042594247a3f6908dc2aa4fb2 Mon Sep 17 00:00:00 2001 From: Sven van de Scheur Date: Wed, 19 Jul 2017 11:18:54 +0200 Subject: [PATCH 10/10] (Temp) ditch moible browsers. --- karma.conf.js | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index a1e27c8..6f7012b 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -78,25 +78,25 @@ module.exports = function(config) { platform: 'Windows 8.1', version: '11' }, - sl_safari_mobile: { - base: 'SauceLabs', - browserName: "Safari", - appiumVersion: "1.6.5", - deviceName: "iPhone Simulator", - deviceOrientation: "portrait", - platformVersion: "10.3", - platformName: "iOS" - }, - sl_chrome_mobile: { - base: 'SauceLabs', - browserName: "Android", - appiumVersion: "1.6.5", - deviceName: "Android Emulator", - deviceOrientation: "portrait", - browserName: "Chrome", - platformVersion: "6.0", - platformName: "Android" - } + // sl_safari_mobile: { + // base: 'SauceLabs', + // browserName: "Safari", + // appiumVersion: "1.6.5", + // deviceName: "iPhone Simulator", + // deviceOrientation: "portrait", + // platformVersion: "10.3", + // platformName: "iOS" + // }, + // sl_chrome_mobile: { + // base: 'SauceLabs', + // browserName: "Android", + // appiumVersion: "1.6.5", + // deviceName: "Android Emulator", + // deviceOrientation: "portrait", + // browserName: "Chrome", + // platformVersion: "6.0", + // platformName: "Android" + // } } config.set({