Merge pull request #6579 from fredj/update_slimerjs

Update slimerjs to v0.10.3

.travis.yml

@@ -5,6 +5,9 @@ language: node_js
 node_js:
   - "6.1"
 
+addons:
+  firefox: "latest"
+
 cache:
   directories:
     - node_modules

package.json

@@ -69,7 +69,7 @@
     "resemblejs": "2.2.3",
     "serve-files": "1.0.1",
     "sinon": "2.0.0",
-    "slimerjs": "0.906.2"
+    "slimerjs": "0.10.3"
   },
   "eslintConfig": {
     "extends": "openlayers",

tasks/test-rendering.js

@@ -38,23 +38,12 @@ serve.createServer(function(err, server) {
       url + '/test_rendering/index.html'
     ];
 
-    // TODO
-    // Workaround for https://github.com/laurentj/slimerjs/issues/333. When a
-    // version with the fix is released, replace block below with:
-    // var child = spawn(slimerjs.path, args, {stdio: 'pipe'});
-    // child.on('exit', function(code) {
-    //   process.exit(code);
-    // }
-
     var child = spawn(slimerjs.path, args, {stdio: 'pipe'});
     child.stdout.on('data', function(data) {
       process.stdout.write(data);
-      if (data == 'All tests passed.\n') {
-        process.exit(0);
-      }
     });
-    child.on('exit', function() {
+    child.on('exit', function(code) {
-      process.exit(1);
+      process.exit(code);
     });
   });
 

test_rendering/spec/ol/layer/vectortile.test.js

@@ -76,7 +76,7 @@ describe('ol.rendering.layer.VectorTile', function() {
       map = createMap('canvas');
       waitForTiles(source, {}, function() {
         expectResemble(map, 'spec/ol/layer/expected/vectortile-canvas.png',
-            11.6, done);
+            11.7, done);
       });
     });