Merge pull request #3 from L42y/os_version

feat: os version option

README.md

@@ -43,14 +43,15 @@ module.exports = function(config) {
       bs_firefox_mac: {
         base: 'BrowserStack',
         browser: 'firefox',
-        os: 'mac',
+        os: 'OS X',
+        os_versio: 'Mountain Lion',
         version: '21.0'
       },
       bs_iphone5: {
         base: 'BrowserStack',
         device: 'iPhone 5',
         os: 'ios',
-        version: '6.0'
+        os_version: '6.0'
       }
     },
 
@@ -70,6 +71,7 @@ module.exports = function(config) {
 - `browser` name of the browser
 - `version` version of the browser
 - `os` which platform ?
+- `os_version` version of the platform
 
 For an example project of, check out Karma's [e2e test](https://github.com/karma-runner/karma/tree/master/test/e2e/browserstack).
 

index.js

@@ -73,7 +73,7 @@ var BrowserStackBrowser = function(id, emitter, args, logger,
   var captured = false;
   var log = logger.create('launcher.browserstack');
   var browserName = (args.browser || args.device) + (args.version ? ' ' + args.version : '') +
-                    (args.os ? ' (' + args.os + ')' : '') + ' on BrowserStack';
+                    ' (' + args.os + ' ' + args.os_version +  ')' + ' on BrowserStack';
 
   this.id = id;
   this.name = browserName;
@@ -82,9 +82,10 @@ var BrowserStackBrowser = function(id, emitter, args, logger,
     // TODO(vojta): handle non os/browser/version
     var settings = {
       os: args.os,
+      os_version: args.os_version,
       device: args.device,
       browser: args.browser,
-      version: args.version || 'latest',
+      browser_version: args.version || 'latest',
       url: url + '?id=' + id
     };
 

package.json

@@ -18,7 +18,7 @@
   ],
   "author": "Vojta Jina <vojta.jina@gmail.com>",
   "dependencies": {
-    "browserstack": "~0.2.0",
+    "browserstack": "~1.0",
     "browserstacktunnel-wrapper": "~1.0.1",
     "q": "~0.9.6"
   },