Issue #533: Merge test suites. use delay as timeout

Gruntfile.js

@@ -9,8 +9,6 @@ module.exports = function(grunt) {
     TEST : 9991
   };
 
-  var DEV_MODE = '?debug';
-
   // create a version based on the build timestamp
   var dateFormat = require('dateformat');
   var version = '-' + dateFormat(new Date(), "yyyy-mm-dd-hh-MM");
@@ -34,25 +32,8 @@ module.exports = function(grunt) {
   var stylePaths = require('./src/piskel-style-list.js').styles;
   var piskelStyles = prefixPaths(stylePaths, "src/");
 
-  var getCasperConfig = function (suiteName, delay, host) {
+  var casperTestPaths = require('./test/casperjs/TestSuite.js').tests;
-    var testPaths = require('./test/casperjs/' + suiteName).tests;
+  var casperTests = prefixPaths(casperTestPaths, "test/casperjs/");
-    var tests = prefixPaths(testPaths, "test/casperjs/");
-
-    return {
-      files : {src: tests},
-      options : {
-        casperjsOptions: [
-          '--baseUrl=http://' + host + ':' + PORT.TEST,
-          '--mode=' + DEV_MODE,
-          '--delay=' + delay,
-          '--verbose=false',
-          '--log-level=info',
-          '--print-command=false',
-          '--print-file-paths=true',
-        ]
-      },
-    };
-  };
 
   var getConnectConfig = function (base, port, host) {
     if (typeof base === 'string') {
@@ -134,7 +115,7 @@ module.exports = function(grunt) {
         path : 'http://' + hostname + ':' + PORT.PROD + '/'
       },
       dev : {
-        path : 'http://' + hostname + ':' + PORT.DEV + '/' + DEV_MODE
+        path : 'http://' + hostname + ':' + PORT.DEV + '/?debug'
       }
     },
 
@@ -282,8 +263,19 @@ module.exports = function(grunt) {
     },
 
     casperjs : {
-      'travis' : getCasperConfig('TravisTestSuite.js', 10000, hostname),
+      files : {
-      'local' : getCasperConfig('LocalTestSuite.js', 50, hostname)
+        src: casperTests
+      },
+      options : {
+        casperjsOptions: [
+          '--baseUrl=http://' + hostname + ':' + PORT.TEST,
+          '--mode=?debug',
+          '--verbose=false',
+          '--log-level=info',
+          '--print-command=false',
+          '--print-file-paths=true',
+        ]
+      },
     },
 
     /**
@@ -312,38 +304,34 @@ module.exports = function(grunt) {
     }
   });
 
-  // Validate
+  // TEST TASKS
+  // Run linting
   grunt.registerTask('lint', ['jscs:js', 'leadingIndent:css', 'jshint']);
-
+  // Run unit-tests
-  // karma/unit-tests task
   grunt.registerTask('unit-test', ['karma']);
+  // Run linting, unit tests and drawing tests
+  grunt.registerTask('test', ['lint', 'unit-test', 'build-dev', 'connect:test', 'casperjs']);
+  // Run the tests, even if the linting fails
+  grunt.registerTask('test-nolint', ['unit-test', 'build-dev', 'connect:test', 'casperjs']);
+  // Used by optional precommit hook
+  grunt.registerTask('precommit', ['test']);
 
-  // Validate & Test
+  // BUILD TASKS
-  grunt.registerTask('test-travis', ['lint', 'unit-test', 'build-dev', 'connect:test', 'casperjs:travis']);
-  // Validate & Test (faster version) will NOT work on travis !!
-  grunt.registerTask('test-local', ['lint', 'unit-test', 'build-dev', 'connect:test', 'casperjs:local']);
-  grunt.registerTask('test-local-nolint', ['unit-test', 'build-dev', 'connect:test', 'casperjs:local']);
-
-  grunt.registerTask('test', ['test-travis']);
-  grunt.registerTask('precommit', ['test-local']);
-
   grunt.registerTask('build-index.html', ['includereplace']);
   grunt.registerTask('merge-statics', ['concat:js', 'concat:css', 'uglify']);
   grunt.registerTask('build',  ['clean:prod', 'sprite', 'merge-statics', 'build-index.html', 'replace:mainPartial', 'copy:prod']);
   grunt.registerTask('build-dev',  ['clean:dev', 'sprite', 'build-index.html', 'copy:dev']);
-
-  // Validate & Build
-  grunt.registerTask('default', ['lint', 'build']);
-
-  // Build stand alone app with nodewebkit
   grunt.registerTask('desktop', ['clean:desktop', 'default', 'replace:desktop', 'nwjs:windows']);
   grunt.registerTask('desktop-mac', ['clean:desktop', 'default', 'replace:desktop', 'nwjs:macos']);
 
+  // SERVER TASKS
   // Start webserver and watch for changes
   grunt.registerTask('serve', ['build', 'connect:prod', 'open:prod', 'watch:prod']);
   // Start webserver on src folder, in debug mode
   grunt.registerTask('serve-dev', ['build-dev', 'connect:dev', 'open:dev', 'watch:dev']);
-
   grunt.registerTask('serve-debug', ['serve-dev']);
   grunt.registerTask('play', ['serve-dev']);
+
+  // Default task
+  grunt.registerTask('default', ['lint', 'build']);
 };

package.json

@@ -23,7 +23,7 @@
   "scripts": {
     "test": "grunt test",
     "start": "nodewebkit",
-    "preversion": "grunt test-local build",
+    "preversion": "grunt test build",
     "postversion": "git push && git push --tags && npm publish"
   },
   "devDependencies": {

test/casperjs/DrawingTest.js

@@ -18,10 +18,6 @@
 
       casper.then(function () {
         this.echo('Running test : ' + currentTest);
-        this.wait(casper.cli.get('delay'));
-      });
-
-      casper.then(function () {
         this.echo('... Waiting for test result : ' + resultSelector);
         this.waitForSelector(resultSelector, function () {
           // then

test/casperjs/SmokeTest.js

@@ -1,17 +1,13 @@
-casper.test.begin('Smoke Test', 2, function(test) {
+casper.test.begin('Smoke Test', 1, function(test) {
   casper
     .start(casper.cli.get('baseUrl')+"/?debug")
-    .then(function () {
-      this.wait(casper.cli.get('delay'));
-    })
     .then(function () {
       this.echo(casper.cli.get('baseUrl')+"/?debug");
-      // If there was a JS error after the page load, casper won't perform asserts
-      test.assertExists('html', 'Casper JS cannot assert DOM elements. A JS error has probably occured.');
-
       this.waitForSelector('#drawing-canvas-container canvas', function() {
         test.assertExists('#drawing-canvas-container canvas', 'Check if drawing canvas element is created');
-      });
+      }, function () {
+        test.fail('Test timed out');
+      }, 10000);
     })
     .run(function () {
       test.done();

test/casperjs/TravisTestSuite.js

@@ -1,4 +0,0 @@
-(typeof exports != "undefined" ? exports : pskl_exports).tests = [
-  'SmokeTest.js',
-  'DrawingTest.js'
-];