From 35d4be5d3ea29296d91ba496721112c1fb0445e6 Mon Sep 17 00:00:00 2001
From: jdescottes <julian.descottes@gmail.com>
Date: Tue, 26 Aug 2014 01:11:14 +0200
Subject: [PATCH] Configuration clenup

---
 Gruntfile.js                                             | 2 +-
 karma.conf.js                                            | 9 +++------
 package.json                                             | 2 +-
 .../casperjs/{TestSuite.js => LocalTestSuite.js}         | 0
 4 files changed, 5 insertions(+), 8 deletions(-)
 rename test/integration/casperjs/{TestSuite.js => LocalTestSuite.js} (100%)

diff --git a/Gruntfile.js b/Gruntfile.js
index b9834ea3..9455cb77 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -31,7 +31,7 @@ module.exports = function(grunt) {
 
   var casperEnvironments = {
     'local' : {
-      suite : './test/integration/casperjs/TestSuite.js',
+      suite : './test/integration/casperjs/LocalTestSuite.js',
       delay : 50
     },
     'travis' : {
diff --git a/karma.conf.js b/karma.conf.js
index 1580b4b3..8fb83788 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -6,7 +6,7 @@ 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');
+  piskelScripts.push('test/js/**/*.js');
   config.set({
 
     // base path that will be used to resolve all patterns (eg. files, exclude)
@@ -23,10 +23,7 @@ module.exports = function(config) {
 
 
     // list of files to exclude
-    exclude: [
-      'src/js/app.js',
-      'test/integration/**/*.js'
-    ],
+    exclude: [],
 
 
     // preprocess matching files before serving them to the browser
@@ -55,7 +52,7 @@ module.exports = function(config) {
 
 
     // enable / disable watching file and executing tests whenever any file changes
-    autoWatch: false,
+    autoWatch: true,
 
 
     // start these browsers
diff --git a/package.json b/package.json
index 05405c69..1da0caa1 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "name": "piskel",
   "main": "./dest/index.html",
   "description": "Web based 2d animations editor",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "homepage": "http://github.com/juliandescottes/piskel",
   "repository": {
     "type": "git",
diff --git a/test/integration/casperjs/TestSuite.js b/test/integration/casperjs/LocalTestSuite.js
similarity index 100%
rename from test/integration/casperjs/TestSuite.js
rename to test/integration/casperjs/LocalTestSuite.js