Lint free rendering tests

package.json

@@ -12,7 +12,7 @@
     "install": "node tasks/install.js",
     "postinstall": "closure-util update",
     "start": "node tasks/serve.js",
-    "pretest": "eslint tasks test src examples",
+    "pretest": "eslint tasks test test_rendering src examples",
     "test": "node tasks/test.js",
     "debug-server": "node tasks/serve-lib.js"
   },

test/spec/ol/source/tilesource.test.js

@@ -1,6 +1,3 @@
-/* eslint-disable valid-jsdoc */
-// TODO: remove the line above when ESLint 2.0 is released
-
 goog.provide('ol.test.source.TileSource');
 
 describe('ol.source.Tile', function() {

test_rendering/slimerjs-profile/prefs.js

@@ -1,4 +1,6 @@
-user_pref("webgl.force-enabled", true);
+/* global user_pref */
-user_pref("webgl.disabled", false);
+
-user_pref("webgl.msaa-force", true);
+user_pref('webgl.force-enabled', true);
-user_pref("layout.css.devPixelsPerPx", "1.0");
+user_pref('webgl.disabled', false);
+user_pref('webgl.msaa-force', true);
+user_pref('layout.css.devPixelsPerPx', '1.0');

test_rendering/spec/.eslintrc

@@ -0,0 +1,14 @@
+{
+  "env": {
+    "mocha": true
+  },
+  "globals": {
+    "IMAGE_TOLERANCE": false,
+    "assertWebGL": false,
+    "createMapDiv": false,
+    "disposeMap": false,
+    "expect": false,
+    "expectResemble": false,
+    "resembleCanvas": false
+  }
+}

test_rendering/spec/ol/style/circle.test.js

@@ -8,7 +8,7 @@ describe('ol.rendering.style.Circle', function() {
     target = createMapDiv(50, 50);
 
     vectorSource = new ol.source.Vector();
-    vectorLayer = new ol.layer.Vector({
+    var vectorLayer = new ol.layer.Vector({
       source: vectorSource
     });
 

test_rendering/spec/ol/style/icon.test.js

@@ -8,7 +8,7 @@ describe('ol.rendering.style.Icon', function() {
     target = createMapDiv(50, 50);
 
     vectorSource = new ol.source.Vector();
-    vectorLayer = new ol.layer.Vector({
+    var vectorLayer = new ol.layer.Vector({
       source: vectorSource
     });
 

test_rendering/spec/ol/style/linestring.test.js

@@ -8,7 +8,7 @@ describe('ol.rendering.style.LineString', function() {
     target = createMapDiv(50, 50);
 
     vectorSource = new ol.source.Vector();
-    vectorLayer = new ol.layer.Vector({
+    var vectorLayer = new ol.layer.Vector({
       source: vectorSource
     });
 

test_rendering/spec/ol/style/polygon.test.js

@@ -8,7 +8,7 @@ describe('ol.rendering.style.Polygon', function() {
     target = createMapDiv(50, 50);
 
     vectorSource = new ol.source.Vector();
-    vectorLayer = new ol.layer.Vector({
+    var vectorLayer = new ol.layer.Vector({
       source: vectorSource
     });
 

test_rendering/spec/ol/style/regularshape.test.js

@@ -8,7 +8,7 @@ describe('ol.rendering.style.RegularShape', function() {
     target = createMapDiv(50, 50);
 
     vectorSource = new ol.source.Vector();
-    vectorLayer = new ol.layer.Vector({
+    var vectorLayer = new ol.layer.Vector({
       source: vectorSource
     });
 

test_rendering/test.js

@@ -1,30 +1,32 @@
+/* global phantom, slimer */
+/* eslint-disable no-console */
+
 var url = phantom.args[0];
-var page = require("webpage").create();
+var page = require('webpage').create();
 
 var v = slimer.geckoVersion;
 console.log('Gecko: ' + v.major + '.' + v.minor + '.' + v.patch);
 
-page.open(url).
+page.open(url).then(function(status) {
-    then(function(status){
+  if (status === 'success') {
-        if (status == "success") {
+    page.onCallback = function(failedTests) {
-            page.onCallback = function(failedTests) {
+      if (failedTests.length > 0) {
-                if (failedTests.length > 0) {
+        for (var i = 0; i < failedTests.length; i++) {
-                    for (var i = 0; i < failedTests.length; i++) {
+          var test = failedTests[i];
-                        var test = failedTests[i];
+          console.log(test.title);
-                        console.log(test.title);
+          console.error(test.errorStack);
-                        console.error(test.errorStack);
+          console.log('');
-                        console.log('');
+        }
-                    }
+        console.error(failedTests.length + ' test(s) failed.');
-                    console.error(failedTests.length + ' test(s) failed.');
+      } else {
-                } else {
+        console.log('All tests passed.');
-                    console.log('All tests passed.');
+      }
-                }
+      page.close();
-                page.close();
+      phantom.exit(failedTests.length === 0 ? 0 : 1);
-                phantom.exit(failedTests.length === 0 ? 0 : 1);
+    }
-            }
+  } else {
-         } else {
+    console.error('The tests could not be started. Is the server running?');
-            console.error("The tests could not be started. Is the server running?");
+    page.close();
-            page.close();
+    phantom.exit(1);
-            phantom.exit(1);
+  }
-         }
+});
-    });