Merge lp:~stephen-stewart/online-services-common-js/grover-local-phantomjs into lp:online-services-common-js

[Stephen Stewart]

Use local phantomjs for grover

Use local phantomjs for grover

[Jonas G. Drange (jonas-drange)]

https://pastebin.canonical.com/107641/ [1]

[1] clean install, removed global phantomjs (since the npm installer reacts to it)

review: Needs Fixing

[lp:~stephen-stewart/online-services-common-js/grover-local-phantomjs]

31. By Stephen Stewart on 2014-04-02

add phantomjs to devDeps

[Stephen Stewart (stephen-stewart)]

1) grover was depending on a global phantomjs, which in my new system didn't exist. mocha bundles it's own phantomjs, so it's unaffected.
2) i updated to use local phantom path, but did 'npm install phantomjs' not 'npm install phantomjs --save-dev', so any 'npm install'

[Jonas G. Drange (jonas-drange)]

I did
$ bzr update && rm -rf node_modules && npm i

and got https://pastebin.canonical.com/107685/

[Jonas G. Drange (jonas-drange)]

1.9.7-3 works, not sure why ^1.9 is not

[Jonas G. Drange (jonas-drange)]

review: Approve

=== modified file 'Gruntfile.js'
--- Gruntfile.js	2014-04-02 10:35:07 +0000
+++ Gruntfile.js	2014-04-02 15:33:20 +0000
@@ -224,7 +224,6 @@
 
         var module = filepath.split(path.sep)[1];
 
-
         // jshint
         grunt.config('jshint.pre.src', filepath);
 
@@ -316,8 +315,9 @@
             args,
             child;
 
-        // arguments are a list of files to test
         args = this.filesSrc;
+        args.unshift('./node_modules/.bin/phantomjs');
+        args.unshift('--phantom-bin');
         args.unshift(grover);
 
         child = exec(process.execPath, args, {

=== modified file 'package.json'
--- package.json	2014-04-02 12:31:55 +0000
+++ package.json	2014-04-02 15:33:20 +0000
@@ -1,10 +1,9 @@
 {
   "name": "online-services-common-js",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "online services yui modules",
   "homepage": "https://launchpad.net/online-services-common-js",
   "bugs": "https://bugs.launchpad.net/online-services-common-js",
-  "files": "build",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "prepublish": "grunt bootstrap && bower install && grunt test"
@@ -34,7 +33,8 @@
     "mocha": "~1.17.1",
     "chai": "~1.9.0",
     "grunt-mocha": "~0.4.10",
-    "grunt-shell": "~0.6.4"
+    "grunt-shell": "~0.6.4",
+    "phantomjs": "^1.9.7-1"
   },
   "readmeFilename": "README.md"
 }