Browse Source

switch to saucelabs

Jason Chen 11 years ago
parent
commit
9c1291f715
5 changed files with 53 additions and 49 deletions
  1. 1 0
      .gitignore
  2. 1 1
      Makefile
  3. 2 2
      package.json
  4. 0 46
      tests/karma/browserstack.conf.coffee
  5. 49 0
      tests/karma/remote.conf.coffee

+ 1 - 0
.gitignore

@@ -5,3 +5,4 @@ tests/webdriver/fuzzer_output
 tests/webdriver/logs
 libpeerconnection.log
 chromedriver.log
+sauce_connect.log

+ 1 - 1
Makefile

@@ -13,7 +13,7 @@ test-karma:
 	@./node_modules/karma/bin/karma start tests/karma/unit.conf.coffee --browsers PhantomJS --no-single-run
 
 test-remote:
-	@./node_modules/karma/bin/karma start tests/karma/browserstack.conf.coffee
+	@./node_modules/karma/bin/karma start tests/karma/remote.conf.coffee
 
 test-unit:
 	@./node_modules/karma/bin/karma start tests/karma/unit.conf.coffee

+ 2 - 2
package.json

@@ -35,8 +35,8 @@
     "karma"                : "0.10.x",
     "karma-coverage"       : "0.2.x",
     "karma-mocha"          : "0.1.x",
-    "karma-browserstack-launcher" : "0.0.x",
-    "karma-safari-launcher"       : "0.1.x",
+    "karma-sauce-launcher" : "0.1.x",
+    "karma-safari-launcher": "0.1.x",
     "mocha"                : "1.17.x"
   },
   "engine": {

+ 0 - 46
tests/karma/browserstack.conf.coffee

@@ -1,46 +0,0 @@
-_     = require('underscore')._
-base  = require('./all.conf')
-pjson = require('../../package.json')
-
-browsers =
-  'mac-chrome'  : ['OS X', 'Mavericks', 'chrome', 'latest']
-  'mac-firefox' : ['OS X', 'Mavericks', 'firefox', 'latest']
-  'mac-safari'  : ['OS X', 'Mavericks', 'safari', 'latest']
-
-  'windows-8-chrome'  : ['Windows', '8.1', 'chrome', 'latest']
-  'windows-8-firefox' : ['Windows', '8.1', 'firefox', 'latest']
-  'windows-8-ie-11'   : ['Windows', '8.1', 'ie', '11.0']
-  'windows-8-ie-10'   : ['Windows', '8', 'ie', '10.0']
-
-  'windows-7-ie-9'    : ['Windows', '7', 'ie', '9.0']
-  'windows-7-ie-8'    : ['Windows', '7', 'ie', '8.0']
-
-  'iphone'  : ['ios', '7.0', 'iPhone 5S']
-  'ipad'    : ['ios', '7.0', 'iPad 3rd (7.0)']
-  #'android' : ['android', '4.2', 'LG Nexus 4']       # Tests take wayyy too long
-browserList = []
-customLaunchers = _.reduce(browsers, (memo, browser, name) ->
-  browserList.push(name)
-  [osName, osVersion, browserName, browserVersion] = browser
-  memo[name] =
-    base: 'BrowserStack'
-    os: osName
-    os_version: osVersion
-  if browserVersion?
-    memo[name].browser = browserName
-    memo[name].browser_version = browserVersion
-  else
-    memo[name].device = browserName
-  return memo
-, {})
-
-module.exports = (config) ->
-  base.call(this, config)
-  config.set(
-    browserStack:
-      project: pjson.name
-    browsers: browserList
-    customLaunchers: customLaunchers
-    exclude: ['tests/mocha/editor.js']
-    reporters: ['dots']
-  )

+ 49 - 0
tests/karma/remote.conf.coffee

@@ -0,0 +1,49 @@
+_     = require('underscore')._
+base  = require('./all.conf')
+pkg   = require('../../package.json')
+
+browsers =
+  'mac-chrome'  : ['Mac 10.9', 'chrome']
+  'mac-firefox' : ['Mac 10.9', 'firefox']
+  'mac-safari'  : ['Mac 10.9', 'safari']
+
+  'windows-chrome'  : ['Windows 8.1', 'chrome']
+  'windows-firefox' : ['Windows 8.1', 'firefox']
+  'windows-ie-11'   : ['Windows 8.1', 'internet explorer', '11']
+
+  'windows-ie-10'   : ['Windows 8', 'internet explorer', '10']
+  'windows-ie-9'    : ['Windows 7', 'ie', '9']
+  'windows-ie-8'    : ['Windows 7', 'ie', '8']
+
+  'linux-chrome'    : ['Linux', 'chrome']
+  'linux-firefox'   : ['Linux', 'firefox']
+
+  'iphone'  : ['Mac 10.8', 'iphone']
+  'ipad'    : ['Mac 10.8', 'ipad']
+  # 'android' : ['Linux', 'android']       # Tests take wayyy too long
+
+browserList = []
+customLaunchers = _.reduce(browsers, (memo, browser, name) ->
+  browserList.push(name)
+  [platform, browserName, browserVersion] = browser
+  memo[name] =
+    base: 'SauceLabs'
+    platform: platform
+    browserName: browserName
+    version: browserVersion
+  return memo
+, {})
+
+module.exports = (config) ->
+  base.call(this, config)
+  config.set(
+    sauceLabs:
+      tags: [pkg.name]
+      # Open source account, please do not abuse
+      username: 'scribe'
+      accessKey: 'e0d99fc3-17bc-4b0d-b131-8621bc81f5a0'
+    browsers: browserList
+    customLaunchers: customLaunchers
+    exclude: ['tests/mocha/editor.js']
+    reporters: ['dots']
+  )