Merge pull request #41 from eysteinbye/GruntConfig

Resetting the grunt publish to Travis
Assert · Mar 22, 2014 · 730de7f · 730de7f
2 parents 20b186f + 6f462bf
commit 730de7f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: node_js
 node_js:
 - '0.10'
 before_script:
-#- npm install -g grunt-cli
+- npm install -g grunt-cli
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start
 - sleep 3

diff --git a/bootstrap.js b/bootstrap.js
diff --git a/package.json b/package.json
@@ -2,8 +2,8 @@
   "name": "ShowMe",
   "private": true,
   "scripts": {
-    "prepublish": "node -e \"require('grunt').tasks(['production']);\"",
-    "test": "node -e \"require('grunt').tasks(['test']);\""
+    "test": "grunt test",
+    "pretest" : "grunt production"
   },
     "devDependencies": {
     "grunt": "^0.4.4",