Merge lp:~stephen-stewart/snapweb/nobody-puts-baby-in-the-corner into lp:~snappy-dev/snapweb/trunk

[Stephen Stewart]

move npm to project root, run js tests in run-checks, use phantomjs by default

based on this lp:~chipaca/webdm/www-tests
but bzr complained about criss cross merges

[John Lenton (chipaca)]

I can ignore those warnings.

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~stephen-stewart/webdm/nobody-puts-baby-in-the-corner into lp:webdm failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/gorilla/mux failed; trying to fetch newer version
update github.com/juju/loggo failed; trying to fetch newer version
github.com/gorilla/mux now at e444e69cbd2e2e3e0749a2f3c717cec491552bbf
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/juju/loggo now at 4c7cbce140ca070eeb59a28f4bf9507e511711f9
update github.com/blakesmith/ar failed; trying to fetch newer version
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/gorilla/context failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update gopkg.in/check.v1 failed; trying to fetch newer version
github.com/gorilla/context now at 50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
update launchpad.net/snappy failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
launchpad.net/snappy now at snappy_tarmac-20150506140221-gy35a67lv7tmc0nl
Building
Obtaining npm dependencies
Running tests from /tmp/tmp.AoOqxvSfIg/src/launchpad.net/webdm
? launchpad.net/webdm/cmd/snappyd [no test files]
? launchpad.net/webdm/oem [no test files]
=== RUN Test
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
2015/05/07 06:01:53 Icon path for installed package cannot be set the icon does not exist
WARNING: cannot create /tmp/check-7854551822259482610/1/badDataPath/icons
OK: 15 passed
--- PASS: Test (0.01 seconds)
PASS
coverage: 38.8% of statements
ok launchpad.net/webdm/snappy 0.014s coverage: 38.8% of statements
? launchpad.net/webdm/webprogress [no test files]
Running vet
Running lint
Running js unit tests (set JS_TESTER to over...

=== renamed file 'www/.jscsrc' => '.jscsrc'
=== modified file 'README.md'
--- README.md	2015-05-06 15:54:38 +0000
+++ README.md	2015-05-07 10:34:41 +0000
@@ -32,7 +32,6 @@
 Install:
 
     npm install -g --prefix=$(npm config get prefix) gulp
-    cd ./www
     npm install
 
 ## Building

=== modified file 'build.sh'
--- build.sh	2015-05-01 10:01:09 +0000
+++ build.sh	2015-05-07 10:34:41 +0000
@@ -39,7 +39,7 @@
 }
 
 echo "Building web assets with gulp..."
-gulp --gulpfile www/gulpfile.js
+gulp
 
 orig_pwd=$(pwd)
 

=== renamed file 'www/gulpfile.js' => 'gulpfile.js'
--- www/gulpfile.js	2015-04-30 14:44:46 +0000
+++ gulpfile.js	2015-05-07 10:34:41 +0000
@@ -24,11 +24,11 @@
 });
 
 gulp.task('js:clean', function(cb) {
-  del(['public/js'], cb);
+  del(['www/public/js'], cb);
 });
 
 function createBundler(watch) {
-  var bundler = browserify('./src/js/app.js', {
+  var bundler = browserify('./www/src/js/app.js', {
     cache: {},
     packageCache: {}
   });
@@ -55,11 +55,11 @@
       .pipe(sourcemaps.init({loadMaps: true})) // loads map from browserify file
       .pipe(uglify())
       .pipe(sourcemaps.write('./')) // writes .map file
-    .pipe(gulp.dest('./public/js/'));
+    .pipe(gulp.dest('www/public/js/'));
 }
 
 gulp.task('js:lint', function() {
-  return gulp.src(['src/js/**/*.js'])
+  return gulp.src(['www/src/js/**/*.js'])
     .pipe(jscs())
     .on('error', function(err) {
       gutil.log(gutil.colors.green(err));
@@ -71,33 +71,33 @@
 // Styles
 
 gulp.task('styles', ['styles:clean'], function() {
-  return gulp.src(['node_modules/normalize.css/normalize.css', 'src/css/**/*.css'])
+  return gulp.src(['node_modules/normalize.css/normalize.css', 'www/src/css/**/*.css'])
   .pipe(csso())
   .pipe(autoprefixer())
   .pipe(concat('webdm.css'))
-  .pipe(gulp.dest('public/css'));
+  .pipe(gulp.dest('www/public/css'));
 });
 
 gulp.task('styles:clean', function(cb) {
-  del(['public/css'], cb);
+  del(['www/public/css'], cb);
 });
 
 // Images
 
 gulp.task('images', ['images:clean'], function() {
-  gulp.src(['src/images/**/*'])
+  gulp.src(['www/src/images/**/*'])
   .pipe(imagemin())
-  .pipe(gulp.dest('public/images'));
+  .pipe(gulp.dest('www/public/images'));
 });
 
 gulp.task('images:clean', function(cb) {
-  del(['public/images'], cb);
+  del(['www/public/images'], cb);
 });
 
 gulp.task('watch', ['js:watch', 'styles', 'images'], function() {
-  gulp.watch('src/images/**/*.{svg,png,jpg,jpeg}', ['images']);
-  gulp.watch('src/css/**/*.css', ['styles']);
-  gulp.watch('src/js/**/*.js', ['js:lint']);
+  gulp.watch('www/src/images/**/*.{svg,png,jpg,jpeg}', ['images']);
+  gulp.watch('www/src/css/**/*.css', ['styles']);
+  gulp.watch('www/src/js/**/*.js', ['js:lint']);
 });
 
 gulp.task('default', ['js:build', 'styles', 'images']);

=== renamed file 'www/karma.conf.js' => 'karma.conf.js'
--- www/karma.conf.js	2015-04-21 08:29:53 +0000
+++ karma.conf.js	2015-05-07 10:34:41 +0000
@@ -21,7 +21,7 @@
         served: true
       },
       **/
-      'tests/**/*Spec.js'
+      'www/tests/**/*Spec.js'
     ],
 
     // list of files to exclude
@@ -31,7 +31,7 @@
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
     preprocessors: {
-      'tests/**/*.js': ['browserify']
+      'www/tests/**/*.js': ['browserify']
     },
 
     // test results reporter to use
@@ -54,7 +54,7 @@
 
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ['Chrome'],
+    browsers: ['PhantomJS'],
 
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits

=== renamed file 'www/package.json' => 'package.json'
--- www/package.json	2015-04-23 16:31:31 +0000
+++ package.json	2015-05-07 10:34:41 +0000
@@ -34,9 +34,9 @@
     "karma-jasmine-ajax": "^0.1.12",
     "karma-phantomjs-launcher": "~0.1.4",
     "lodash": "~3.3.1",
+    "normalize.css": "^3.0.3",
     "vinyl-buffer": "~1.0.0",
     "vinyl-source-stream": "~1.1.0",
-    "watchify": "~3.1.2",
-    "normalize.css": "^3.0.3"
+    "watchify": "~3.1.2"
   }
 }

=== modified file 'run-checks'
--- run-checks	2015-05-03 20:46:35 +0000
+++ run-checks	2015-05-07 10:34:41 +0000
@@ -33,6 +33,10 @@
 echo Building
 go build -v launchpad.net/webdm/...
 
+# www
+echo Obtaining npm dependencies
+npm install && npm update
+
 
 # tests
 echo Running tests from $(pwd)
@@ -43,7 +47,7 @@
 echo Running vet
 go vet ./...
 
- golint
+# golint
 echo Running lint
 lint=$(golint ./...)
 if [ -n "$lint" ]; then
@@ -52,4 +56,9 @@
     exit 1
 fi
 
+# js unit tests
+echo "Running js unit tests (set JS_TESTER to override)"
+${JS_TESTER:- ./node_modules/karma/bin/karma start --single-run}
+
+
 echo "All good, what could possibly go wrong"