From f41b1074744bca86f43364a23d7d9a97d9365ba7 Mon Sep 17 00:00:00 2001 From: Eric Rowell Date: Thu, 27 Feb 2014 19:15:18 -0800 Subject: [PATCH] changed lint to hint in grunt file, and removed KineticEvents-test as it is not a functional test --- Gruntfile.js | 6 ++--- test/functional/KineticEvents-test.js | 34 --------------------------- 2 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 test/functional/KineticEvents-test.js diff --git a/Gruntfile.js b/Gruntfile.js index 7919ee84..27da1d68 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -58,7 +58,7 @@ module.exports = function(grunt) { ]; // Project configuration. - var lintConf = grunt.file.readJSON('.jshintrc'); + var hintConf = grunt.file.readJSON('.jshintrc'); var config = { pkg: grunt.file.readJSON('package.json'), concat: { @@ -181,7 +181,7 @@ module.exports = function(grunt) { build: ['dist/*'] }, jshint: { - options: lintConf, + options: hintConf, all: ['src/**/*.js'] }, copy: { @@ -252,7 +252,7 @@ module.exports = function(grunt) { 'shell:jsdoc', ]); - grunt.registerTask('lint', 'Check lint errors', ['jshint']); + grunt.registerTask('hint', 'Check hint errors', ['jshint']); grunt.registerTask('test', 'Run tests', ['dev', 'mocha_phantomjs']); grunt.registerTask('server', 'run local server and create dev version', function() { diff --git a/test/functional/KineticEvents-test.js b/test/functional/KineticEvents-test.js deleted file mode 100644 index 4b45b3eb..00000000 --- a/test/functional/KineticEvents-test.js +++ /dev/null @@ -1,34 +0,0 @@ -suite('KineticEvents', function() { - - // ====================================================== - test('draw events', function() { - var stage = addStage(); - var layer = new Kinetic.Layer(); - - var circle = new Kinetic.Circle({ - x: stage.getWidth() / 2, - y: stage.getHeight() / 2, - radius: 70, - fill: 'red' - }); - - var events = []; - - layer.on('draw', function(evt) { - events.push('layer-draw'); - }); - - layer.on('beforeDraw', function(evt) { - events.push('layer-beforeDraw'); - }); - - layer.add(circle); - stage.add(layer); - - //console.log(events.toString()) - - assert.equal(events.toString(), 'layer-beforeDraw,layer-draw', 'draw event order is incorrect'); - - - }); -}); \ No newline at end of file