From b14a58651cb5193a674ddbb2257f47670847bec9 Mon Sep 17 00:00:00 2001 From: Karolis Narkevicius Date: Mon, 31 Aug 2015 11:28:56 +0100 Subject: [PATCH] Add more sauce browsers, switch sauce user --- .travis.yml | 5 ++++- karma.conf-ci.js | 29 ++++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c2c8b1e..d45ab5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,4 +5,7 @@ node_js: before_install: - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" -script: "npm test && karma start karma.conf-ci.js" \ No newline at end of file +script: "npm test && karma start karma.conf-ci.js" +env: + global: + - SAUCE_USERNAME=cherrytree \ No newline at end of file diff --git a/karma.conf-ci.js b/karma.conf-ci.js index c2aa1d8..3eb81db 100644 --- a/karma.conf-ci.js +++ b/karma.conf-ci.js @@ -23,11 +23,23 @@ var customLaunchers = { base: 'SauceLabs', browserName: 'firefox' }, + 'SL_Firefox19': { + base: 'SauceLabs', + browserName: 'firefox', + platform: 'Windows XP', + version: '19' + }, 'SL_Safari': { base: 'SauceLabs', browserName: 'safari', - platform: 'OS X 10.9', - version: '7' + platform: 'OS X 10.10', + version: '8' + }, + 'SL_IE_8': { + base: 'SauceLabs', + browserName: 'internet explorer', + platform: 'Windows XP', + version: '8' }, 'SL_IE_9': { base: 'SauceLabs', @@ -46,13 +58,24 @@ var customLaunchers = { browserName: 'internet explorer', platform: 'Windows 8.1', version: '11' + }, + 'SL_iOS': { + base: 'SauceLabs', + browserName: 'iphone', + platform: 'OS X 10.10', + version: '8.1' + }, + 'SL_Android': { + browserName: 'android', + platform: 'Linux', + version: '4.0' } } module.exports = function (c) { c.set(_.extend(config, { sauceLabs: { - testName: 'Cherrytree Tests' + testName: 'Cherrytree' }, customLaunchers: customLaunchers, browsers: Object.keys(customLaunchers),