Merge pull request #214 from juliandescottes/feature-add-tests

Feature add tests

Author: juliandescottes

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - 0.8
+  - 0.10
 before_install:
   - npm update -g npm
   - npm install -g grunt-cli

Gruntfile.js

@@ -10,27 +10,48 @@
  *       If you run this task locally, it may require some env set up first.
  */
 
-var SOURCE_FOLDER = "src";
 
 module.exports = function(grunt) {
   var dateFormat = require('dateformat');
   var now = new Date();
   var version = '-' + dateFormat(now, "yyyy-mm-dd-hh-MM");
 
-  var mapToSrcFolder = function (path) {return [SOURCE_FOLDER, path].join('/');};
+  var mapToSrcFolder = function (path) {
+    return "src/" + path;
+  };
 
-  var piskelScripts = require('./src/piskel-script-list.js').scripts.map(mapToSrcFolder);
+  var piskelScripts = require('./src/piskel-script-list.js').scripts.map(mapToSrcFolder).filter(function (path) {
+    return path.indexOf('devtools') === -1;
+  });
   var piskelStyles = require('./src/piskel-style-list.js').styles.map(mapToSrcFolder);
 
-  var getGhostConfig = function (delay) {
+  var mapToCasperFolder = function (path) {
+    return "test/casperjs/" + path;
+  };
+
+  var casperEnvironments = {
+    'local' : {
+      suite : './test/casperjs/LocalTestSuite.js',
+      delay : 50
+    },
+    'travis' : {
+      suite : './test/casperjs/TravisTestSuite.js',
+      delay : 5000
+    }
+  };
+
+  var getCasperConfig = function (env) {
+    var conf = casperEnvironments[env];
+    var tests = require(conf.suite).tests.map(mapToCasperFolder);
     return {
-      filesSrc : ['test/integration/casperjs/*_test.js'],
+      filesSrc : tests,
       options : {
         args : {
-          baseUrl : 'http://localhost:' + '<%= connect.test.options.port %>/src/',
+          baseUrl : 'http://localhost:' + '<%= express.test.options.port %>/',
           mode : '?debug',
-          delay : delay
+          delay : conf.delay
         },
+        async : false,
         direct : false,
         logLevel : 'info',
         printCommand : false,
@@ -39,6 +60,23 @@ module.exports = function(grunt) {
     };
   };
 
+  var getExpressConfig = function (source, port, host) {
+    var bases;
+    if (typeof source === 'string') {
+      bases = [source];
+    } else if (Array.isArray(source)) {
+      bases = source;
+    }
+
+    return {
+      options: {
+        port: port,
+        hostname : host || 'localhost',
+        bases: bases
+      }
+    };
+  };
+
   grunt.initConfig({
     clean: {
       before: ['dest'],
@@ -62,29 +100,10 @@ module.exports = function(grunt) {
         '!src/js/lib/**/*.js' // Exclude lib folder (note the leading !)
       ]
     },
-    connect : {
-      test : {
-        options : {
-          base : '.',
-          port : 4321
-        }
-      }
-    },
     express: {
-      regular: {
-        options: {
-          port: 9001,
-          hostname : 'localhost',
-          bases: ['dest']
-        }
-      },
-      debug: {
-        options: {
-          port: 9901,
-          hostname : 'localhost',
-          bases: ['src']
-        }
-      }
+      test: getExpressConfig(['src', 'test'], 9991),
+      regular: getExpressConfig('dest', 9001),
+      debug: getExpressConfig(['src', 'test'], 9901)
     },
     open : {
       regular : {
@@ -105,8 +124,8 @@ module.exports = function(grunt) {
       }
     },
     ghost : {
-      'default' : getGhostConfig(5000),
-      local : getGhostConfig(50)
+      'travis' : getCasperConfig('travis'),
+      'local' : getCasperConfig('local')
     },
     concat : {
       js : {
@@ -236,6 +255,11 @@ module.exports = function(grunt) {
         dest: 'build/closure/closure_compiled_binary.js'
       }
     },
+    karma: {
+      unit: {
+        configFile: 'karma.conf.js'
+      }
+    },
     nodewebkit: {
       options: {
         build_dir: './dest/desktop/', // destination folder of releases.
@@ -262,7 +286,6 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-closure-tools');
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-connect');
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-uglify');
@@ -271,18 +294,25 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-replace');
   grunt.loadNpmTasks('grunt-ghost');
   grunt.loadNpmTasks('grunt-open');
+  grunt.loadNpmTasks('grunt-karma');
   grunt.loadNpmTasks('grunt-leading-indent');
   grunt.loadNpmTasks('grunt-node-webkit-builder');
   grunt.loadNpmTasks('grunt-contrib-copy');
 
   // Validate
   grunt.registerTask('lint', ['leadingIndent:jsFiles', 'leadingIndent:cssFiles', 'jshint']);
 
-  // Validate & Test
-  grunt.registerTask('test', ['lint', 'compile', 'connect:test', 'ghost:default']);
+  // karma/unit-tests task
+  grunt.registerTask('unit-test', ['karma']);
 
+  // Validate & Test
+  grunt.registerTask('test-travis', ['lint', 'compile', 'unit-test', 'express:test', 'ghost:travis']);
   // Validate & Test (faster version) will NOT work on travis !!
-  grunt.registerTask('precommit', ['lint', 'compile', 'connect:test', 'ghost:local']);
+  grunt.registerTask('test-local', ['lint', 'compile', 'unit-test', 'express:test', 'ghost:local']);
+
+  grunt.registerTask('test', ['test-travis']);
+  grunt.registerTask('precommit', ['test-local']);
+
 
   // Compile JS code (eg verify JSDoc annotation and types, no actual minified code generated).
   grunt.registerTask('compile', ['closureCompiler:compile', 'clean:after']);

karma.conf.js

@@ -0,0 +1,67 @@
+// Karma configuration
+// Generated on Tue Jul 22 2014 23:49:26 GMT+0200 (Romance Daylight Time)
+
+module.exports = function(config) {
+
+  var mapToSrcFolder = function (path) {return ['src', path].join('/');};
+
+  var piskelScripts = require('./src/piskel-script-list.js').scripts.map(mapToSrcFolder);
+  piskelScripts.push('test/js/**/*.js');
+  config.set({
+
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: '',
+
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['jasmine'],
+
+
+    // list of files / patterns to load in the browser
+    files: piskelScripts,
+
+
+    // list of files to exclude
+    exclude: [],
+
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    preprocessors: {
+    },
+
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['progress'],
+
+
+    // web server port
+    port: 9876,
+
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: true,
+
+
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: ['PhantomJS'],
+
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: true
+  });
+};

misc/scripts/package-windows-executable.cmd

@@ -12,34 +12,14 @@ SETLOCAL
   set APP_BIN="%PISKEL_HOME%\dest\desktop\cache\win\0.9.2"
   set MISC_FOLDER=%PISKEL_HOME%\misc
   set RELEASES_FOLDER=%PISKEL_HOME%\dest\desktop\releases
-  set DEST_FOLDER=%RELEASES_FOLDER%\win
+  set DEST_FOLDER=%RELEASES_FOLDER%\piskel\win\piskel
 
-  ECHO "Building Piskel executable for Windows ..."
-
-  ECHO "Creating release directory ..."
-    MKDIR "%DEST_FOLDER%"
-  ECHO "DONE"
-
-  ECHO "Packaging executable ..."
-    COPY /b "%APP_BIN%\nw.exe"+"%RELEASES_FOLDER%\piskel\piskel.nw" "%DEST_FOLDER%\piskel-raw.exe"
-  ECHO "DONE"
-
-  ECHO "COPYing dependencies ..."
-    COPY "%APP_BIN%\*.dll" "%DEST_FOLDER%\"
-    COPY "%APP_BIN%\nw.pak" "%DEST_FOLDER%\"
-  ECHO "DONE"
 
   ECHO "Updating Piskel icon -- Using Resource Hacker"
-    %RESOURCE_HACKER_PATH%\ResHacker -addoverwrite "%DEST_FOLDER%\piskel-raw.exe", "%DEST_FOLDER%\piskel-exploded.exe", "%MISC_FOLDER%\desktop\logo.ico", ICONGROUP, IDR_MAINFRAME, 1033
-    DEL "%DEST_FOLDER%\piskel-raw.exe"
+    %RESOURCE_HACKER_PATH%\ResHacker -addoverwrite "%DEST_FOLDER%\piskel.exe", "%DEST_FOLDER%\piskel-logo.exe", "%MISC_FOLDER%\desktop\logo.ico", ICONGROUP, IDR_MAINFRAME, 1033
+    DEL "%DEST_FOLDER%\piskel.exe"
   ECHO "DONE"
 
-  ECHO "Boxing application to single file -- Using Enigma Virtual Box"
-    %VBOX_PATH%\enigmavbconsole "%MISC_FOLDER%\desktop\package-piskel.evb"
-    DEL "%DEST_FOLDER%\*.dll"
-    DEL "%DEST_FOLDER%\nw.pak"
-    DEL "%DEST_FOLDER%\piskel-exploded.exe"
-  ECHO "DONE"
 
   PAUSE
   explorer "%DEST_FOLDER%\"

package.json

@@ -3,7 +3,7 @@
   "name": "piskel",
   "main": "./dest/index.html",
   "description": "Web based 2d animations editor",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "homepage": "http://github.com/juliandescottes/piskel",
   "repository": {
     "type": "git",
@@ -14,23 +14,27 @@
     "start": "nodewebkit"
   },
   "devDependencies": {
-    "grunt": "~0.4.1",
+    "dateformat": "1.0.8-1.2.3",
+    "grunt": "~0.4.5",
+    "grunt-closure-tools": "~0.9.7",
     "grunt-contrib-clean": "0.5.0",
-    "grunt-contrib-connect": "0.3.0",
-    "grunt-contrib-concat": "0.1.2",
+    "grunt-contrib-concat": "0.5.0",
     "grunt-contrib-copy": "0.5.0",
-    "grunt-contrib-jshint": "0.5.4",
-    "grunt-contrib-uglify": "0.2.2",
+    "grunt-contrib-jshint": "0.10.0",
+    "grunt-contrib-uglify": "0.5.0",
     "grunt-contrib-watch": "0.6.1",
-    "grunt-express": "1.0",
-    "grunt-replace": "0.7.8",
-    "grunt-ghost": "1.0.12",
-    "grunt-open": "0.2.3",
+    "grunt-express": "1.4.1",
+    "grunt-ghost": "1.1.0",
     "grunt-leading-indent": "0.1.0",
-    "grunt-closure-tools": "~0.8.3",
-    "grunt-node-webkit-builder": "0.1.19",
-    "nodewebkit": "0.8.4",
-    "dateformat" : "1.0.8-1.2.3"
+    "grunt-node-webkit-builder": "0.1.21",
+    "grunt-open": "0.2.3",
+    "grunt-replace": "0.7.8",
+    "grunt-karma": "~0.8.2",
+    "karma": "0.12.17",
+    "karma-chrome-launcher": "^0.1.4",
+    "karma-phantomjs-launcher": "^0.1.4",
+    "karma-jasmine": "^0.1.5",
+    "nodewebkit": "~0.10.1"
   },
   "window": {
     "title": "Piskel",

src/js/Constants.js

@@ -69,5 +69,8 @@ var Constants = {
   MOUSEMOVE_THROTTLING : 10,
 
   ABSTRACT_FUNCTION : function () {throw 'abstract method should be implemented';},
-  EMPTY_FUNCTION : function () {}
+  EMPTY_FUNCTION : function () {},
+
+  // TESTS
+  DRAWING_TEST_FOLDER : 'drawing'
 };

src/js/Events.js

@@ -2,6 +2,8 @@
 var Events = {
 
   TOOL_SELECTED : "TOOL_SELECTED",
+  SELECT_TOOL : "SELECT_TOOL",
+
   TOOL_RELEASED : "TOOL_RELEASED",
   SELECT_PRIMARY_COLOR: "SELECT_PRIMARY_COLOR",
   SELECT_SECONDARY_COLOR: "SELECT_SECONDARY_COLOR",
@@ -47,5 +49,12 @@ var Events = {
 
   ZOOM_CHANGED : "ZOOM_CHANGED",
 
-  CURRENT_COLORS_UPDATED : "CURRENT_COLORS_UPDATED"
+  CURRENT_COLORS_UPDATED : "CURRENT_COLORS_UPDATED",
+
+  MOUSE_EVENT : "MOUSE_EVENT",
+
+  // Tests
+  TEST_RECORD_END : "TEST_RECORD_END",
+  TEST_CASE_END : "TEST_CASE_END",
+  TEST_SUITE_END : "TEST_SUITE_END"
 };