Merge branch 'develop' into testing

Author: starwed

.travis.yml

@@ -7,18 +7,20 @@ cache:
   directories:
   - node_modules
 
-before_install: if [ "$TRAVIS_BRANCH" != "testing" ]; then unset SAUCE_USERNAME && unset SAUCE_ACCESS_KEY; fi
+before_install: if [ "$TRAVIS_BRANCH" != $SAUCE_BRANCH ]; then unset SAUCE_USERNAME && unset SAUCE_ACCESS_KEY; fi
 before_script: npm install -g grunt-cli
 after_success: "./travis-nightly.sh"
 after_failure: if [ "$GH_TOKEN" ]; then grunt gh-pages:crafty-distro-regression-tests; fi
 
 env:
   global:
+  - SAUCE_BRANCH=testing
   # GitHub token
   - secure: p6SeAGd+Gohr6XeDkb5JPSQBu88UxAjljSMK0BNLJQgr8GkoA3mSJWy4uX0YjNq93VX4UMFxr0D4MlkcWZpX+cdN8K9PpxOgTq8Ml1Ljs355zbX9U/CdY99okiwzHktY4qKXBPsHLiEuCBeJ6pxs/v7m9z88mkjwDSunJG7F1oo=
   # OpenSauce credentials: for pre-relase testing
   - secure: NO+7PK5P0XLGbnvdSDBlrlnzqM/hMTy3wxxAp8ZtzEuS2ZOXn8q0KjOO/cAs1NorG1SOl8+XfFZBTR5W504GrHYLP8fNkLJOAyKMfFeTojwQ+385ShVr/NejZFejsc+xJZymIeDsEzBZqosxPOi+8k7jljDK4mzLdKMpt8flWUw=
   - secure: iGO+VCkCq/26Dqrc6+G1nX8Dk+tTqhcINuiIVhxGtMARcY+WIzcyEK/cfXRaLnvIzIxQ0xUoGGnM9xe4DQT8L+BGzo8AGnVbzxITzceWTlhsFepcbOTgqOg0ZGMxQVQ6VBh888Cdks8KsOgtTNhzd+oVgcStsyxZPCVD/7VgNTE=
 
 addons:
-  sauce_connect: true
+  sauce_connect:
+    no_ssl_bump_domains: all

Gruntfile.js

@@ -278,7 +278,8 @@ module.exports = function (grunt) {
     grunt.registerTask('test-cloud-webdriver', ['webdriver:cloud']);
     grunt.registerTask('test-cloud', function() {
         // execute cloud tests only in travis, while on testing branch, with open sauce lab credentials
-        if (process.env.TRAVIS && process.env.TRAVIS_BRANCH === "testing" &&
+        var branch =  process.env.TRAVIS_BRANCH;
+        if (process.env.TRAVIS && branch === process.env.SAUCE_BRANCH &&
             process.env.SAUCE_USERNAME && process.env.SAUCE_ACCESS_KEY)
             grunt.task.run('connect', 'test-cloud-browser', 'test-cloud-webdriver');
     });

package.json

@@ -54,7 +54,7 @@
     "node-jsx": "^0.13.3",
     "node-resemble-js": "^0.1.1",
     "open": "^0.0.5",
-    "phantomjs-prebuilt": "2.1.13",
+    "phantomjs-prebuilt": "2.1.14",
     "q": "^1.4.1",
     "q-io": "^1.13.1",
     "qunitjs": "^2.0.1",

supported-browsers-webdriver.json

@@ -0,0 +1,37 @@
+[
+  {
+    "browserName": "internet explorer",
+    "version": "9.0",
+    "platform": "Windows 7"
+  },
+  {
+    "browserName": "MicrosoftEdge",
+    "version": "latest",
+    "platform": "Windows 10"
+  },
+  {
+    "browserName": "chrome",
+    "version": "26.0",
+    "platform": "Windows XP"
+  },
+  {
+    "browserName": "chrome",
+    "version": "beta",
+    "platform": "Windows 10"
+  },
+  {
+    "browserName": "safari",
+    "version": "6.0",
+    "platform": "OS X 10.8"
+  },
+  {
+    "browserName": "safari",
+    "version": "latest",
+    "platform": "OS X 10.11"
+  },
+  {
+    "browserName": "firefox",
+    "version": "latest",
+    "platform": "Linux"
+  }
+]

supported-browsers.json

@@ -60,7 +60,7 @@
   },
   {
     "browserName": "iphone",
-    "version": "8.1",
+    "version": "9.1",
     "deviceName": "iPhone Simulator",
     "platform": "OS X 10.10",
     "deviceOrientation": "landscape"

tests/index-headless.js

@@ -1,5 +1,5 @@
 /** CRAFTY-JS **/
-GLOBAL.Crafty = require('../src/crafty-headless.js')();
+global.Crafty = require('../src/crafty-headless.js')();
 Crafty.init();
 
 /** COMMON TEST CODE **/

tests/time.js

@@ -139,7 +139,9 @@
 
   test("curTime", 1, function() {
     var startTime, lastKnownTime;
+
     var framesTriggered = 0;
+
     Crafty.e("").bind("EnterFrame", function(params) {
       framesTriggered++;
       if (!startTime) {
@@ -148,7 +150,6 @@
         lastKnownTime = params.gameTime;
       }
     });
-
     setTimeout(function() {
       var endTime = lastKnownTime;
 

tests/webdriver/index-webdriver-cloud.js

@@ -21,7 +21,7 @@ exports.config = {
             'public': 'public'
         };
 
-        var browsers = require('../../supported-browsers.json');
+        var browsers = require('../../supported-browsers-webdriver.json');
         browsers.forEach(function(capabilities) {
             for (var k in baseCapabilities)
                 capabilities[k] = baseCapabilities[k];
@@ -30,7 +30,6 @@ exports.config = {
                 capabilities.browserName, capabilities.version, capabilities.platform
             );
         });
-
         return browsers;
     })(),
     updateJob: true,
@@ -43,5 +42,5 @@ exports.config = {
     onPrepare: require('./index-webdriver.js').onPrepare,
     before: require('./index-webdriver.js').before,
     after: require('./index-webdriver.js').after,
-    onComplete: require('./index-webdriver.js').onComplete
+    onComplete: require('./index-webdriver.js').onComplete,
 };

tests/webdriver/index-webdriver.js

@@ -9,14 +9,14 @@ var fs = require('fs'),
 
 // ADD ALL TESTS & RUN CONDITIONS HERE
 var tests = {
-    'template-generic': true,
-    'template-local': true,
-    'template-crafty': true,
-    'template-multi': true,
+    // Problems with input capture in firefox driver
+    'template-multi': function(browserName) { return browserName !== "firefox"; },
     'color/color-dom': true,
     'color/color-canvas': true,
-    'color/color-webgl': function(browserName) { return browserName !== 'phantomjs'; }
+    // neither phantomjs nor open sauce support webgl right now
+    'color/color-webgl': function(browserName) { return false; }
 };
+
 exports.specs = function() {
     return Object.keys(tests).map(function(t) {
         return 'tests/webdriver/' + t + '.js';
@@ -27,7 +27,7 @@ exports.exclude = function(browserName, version, platform) {
         runCondition;
     for (var test in tests) {
         runCondition = tests[test];
-        if (runCondition !== true && !runCondition(browserName, version, platform))
+        if (runCondition !== true && (runCondition === false || !runCondition(browserName, version, platform)))
             excluded.push('tests/webdriver/' + test + '.js');
     }
     return excluded;
@@ -43,13 +43,13 @@ function getRunId(capabilities) {
 // =====
 exports.onPrepare = function() {};
 exports.before = function() { // BEFORE RUNNING ANY TESTS, WITH GLOBALS AVAILABLE
-    var capabilities = GLOBAL.browser.desiredCapabilities;
+    var capabilities = global.browser.desiredCapabilities;
 
     //TODO retry commands with webbriverio/lib/helpers.js/staleElementRetry if need arises (StaleElementReference)
-    addGenericCommands(GLOBAL.browser);
-    addBrowserSpecificCommands(GLOBAL.browser, capabilities);
-    addTestSpecificCommands(GLOBAL.browser, GLOBAL.QUnit, getRunId(capabilities));
-    return setBrowserSpecificConfig(GLOBAL.browser, capabilities);
+    addGenericCommands(global.browser);
+    addBrowserSpecificCommands(global.browser, capabilities);
+    addTestSpecificCommands(global.browser, global.QUnit, getRunId(capabilities));
+    return setBrowserSpecificConfig(global.browser, capabilities);
 };
 exports.after = function(failures, pid) {};
 exports.onComplete = function() {};
@@ -147,6 +147,9 @@ function addGenericCommands(client) {
 
 // NON-STANDARD SCREENSHOT REGIONS PER PLATFORM
 var rotatedCrops = {};
+
+// These platforms are no longer used, and the updated versions require different regions
+// TODO: update them and add the new platforms back to supported-platforms-webdriver
 rotatedCrops[getRunId({"browserName": "android", "version": "4.1", "platform": "Linux"})] = { x: 0, y: 98, w: 261, h: 196, stretchW: 320, stretchH: 240 };
 rotatedCrops[getRunId({"browserName": "android", "version": "5.1", "platform": "Linux"})] = { x: 0, y: 110, w: 261, h: 196, stretchW: 320, stretchH: 240 };
 // TODO: iphone 8.4 emulator currently changing screenshot region constantly, readd to supported-browsers and observe region in future
@@ -308,11 +311,14 @@ function addTestSpecificCommands(client, QUnit, runId) {
 
     // WEBDRIVER COMMAND: TEST PAGE URL SHORTCUT
     client.addCommand("testUrl", function(testName, testScript) {
+        
         if (typeof testName === 'string' && typeof testScript === 'undefined') {
             testScript = testName;
             testName = undefined;
         }
 
+        console.log("\n# Starting " + (testName || currentTestName)  + " test for " + runId);
+
         if (typeof testScript === 'string') {
             var testFilePath = resultPath + (testName || currentTestName) + '.html',
                 testFile = "<!DOCTYPE html>"                                                + EOL +
@@ -330,10 +336,9 @@ function addTestSpecificCommands(client, QUnit, runId) {
                     "</script>"                                                             + EOL +
                     "</body>"                                                               + EOL +
                     "</html>"                                                               + EOL;
-
-            return qfs.write(testFilePath, testFile, 'w+')
-                    .then(this.url.bind(this, testFilePath));
-        } else {
+            return qfs.write("./" + testFilePath, testFile, 'w+')
+                    .then(this.url.bind(this, "/" + testFilePath));
+        } else { 
             return this.url(testPath + currentTestPath + '.html');
         }
     });