Merge 4ed913a into dd8d78e

maykinmedia · Jul 13, 2017 · c6a92b8 · c6a92b8
2 parents dd8d78e + 4ed913a
commit c6a92b8
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 33 deletions.
diff --git 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.

diff --git a/karma.conf.js b/karma.conf.js
@@ -19,12 +19,32 @@ 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_ie_11: {
+            base: 'SauceLabs',
+            browserName: 'internet explorer',
+            platform: 'Windows 8.1',
+            version: '11'
+        }
+    }
 
+    config.set({
         frameworks: [
             'jasmine-jquery',
             'jasmine-ajax',
@@ -53,36 +73,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
@@ -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",