Merge pull request #160 from webrtc/fixTests

Add browser version check in the webdriver creation step

Author: KaptenJansson

adapter.js

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source

test/selenium-lib.js

@@ -13,9 +13,37 @@
 var webdriver = require('selenium-webdriver');
 var chrome = require('selenium-webdriver/chrome');
 var firefox = require('selenium-webdriver/firefox');
+var fs = require('fs');
 
 var sharedDriver = null;
 
+function getBrowserVersion() {
+  var browser = process.env.BROWSER;
+  var browserChannel = process.env.BVER;
+  var symlink = './browsers/bin/' + browser + '-' + browserChannel + '/';
+  var path = fs.readlink(symlink);
+
+  // Browser reg expressions and position to look for the milestone version.
+  var chromeExp = '/Chrom(e|ium)\/([0-9]+)\./';
+  var firefoxExp = '/Firefox\/([0-9]+)\./';
+  var chromePos = 2;
+  var firefoxPos = 1;
+
+  var browserVersion = function(path, expr, pos) {
+    var match = path.match(expr);
+    return match && match.length >= pos && parseInt(match[pos], 10);
+  };
+
+  switch (browser) {
+    case 'chrome':
+      return browserVersion(path, chromeExp, chromePos);
+    case 'firefox':
+      return browserVersion(path, firefoxExp, firefoxPos);
+    default:
+      return 'non supported browser.';
+  }
+}
+
 function buildDriver() {
   if (sharedDriver) {
     return sharedDriver;
@@ -45,6 +73,11 @@ function buildDriver() {
       .addArguments('use-fake-device-for-media-stream')
       .addArguments('use-fake-ui-for-media-stream');
 
+  // Only enable this for Chrome >= 49.
+  if (process.env.BROWSER === 'chrome' && getBrowserVersion >= '49') {
+    chromeOptions.addArguments('--enable-experimental-web-platform-features');
+  }
+
   sharedDriver = new webdriver.Builder()
       .forBrowser(process.env.BROWSER)
       .setFirefoxOptions(firefoxOptions)

test/test.js

@@ -384,7 +384,7 @@ test('attachMediaStream', function(t) {
       webdriver.By.id('video')), 3000);
   })
   .then(function(videoElement) {
-    t.pass('attachMediaStream succesfully attached stream to video element');
+    t.pass('attachMediaStream successfully attached stream to video element');
     videoElement.getAttribute('videoWidth')
     .then(function(width) {
       videoElement.getAttribute('videoHeight')
@@ -471,7 +471,7 @@ test('reattachMediaStream', function(t) {
       webdriver.By.id('video')), 3000);
   })
   .then(function(videoElement) {
-    t.pass('attachMediaStream succesfully attached stream to video element');
+    t.pass('attachMediaStream successfully attached stream to video element');
     videoElement.getAttribute('videoWidth')
     .then(function(width) {
       videoElement.getAttribute('videoHeight')