Merge bfe203f into d671e6c

.travis.yml

@@ -1,12 +1,12 @@
 language: node_js
-node_js: "6.11.2"
+node_js: "11.14.0"
 cache: npm
 before_install: npm install -g grunt-cli
 install: npm install
 deployg: grunt release
 before_script: grunt setup
 script:
-  - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then echo "grunt test coverage"; grunt test coverage; fi
+  - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then echo "grunt test"; grunt test; fi
   #- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then echo "grunt sauce"; grunt sauce; fi
 env:
   global:

grunt/aliases.yaml

@@ -68,27 +68,25 @@ css:
   - 'autoprefixer'
 
 # Testing
-test:
-  - 'server:once'
-  - 'mocha-runner:all'
-
-'test:release':
-  - 'server:release:once'
-  - 'mocha-runner:all'
-
-coverage:
-  - 'clean:coverage'
-  - 'exec:nyc-instrument'
-  - 'mocha-runner:coverage'
-  - 'coverage-report:coveralls'
-  - 'exec:coveralls-report'
-
 # Initial Setup
 setup:
   - 'assets'
   - 'copy:discovery_vars'
   - 'sass'
 
+test:
+  - 'clean:coverage'
+  - 'clean:release'
+  - 'copy:release'
+  - 'compile-handlebars:index'
+  - 'babel'
+  - 'string-replace:final'
+  - 'exec:nyc-instrument'
+  - 'server:once'
+  - 'puppet:all'
+  - 'coverage-report:coveralls'
+  - 'exec:coveralls-report'
+
 # Release
 release:
   description: 'Build the assets and prepare for a release'

grunt/exec.js

@@ -31,7 +31,7 @@ module.exports = {
     cmd: "mkdir src/libs/enzyme && ./node_modules/.bin/browserify --standalone enzyme -x 'react/addons' -x 'react/lib/ReactContext' -x 'react/lib/ExecutionEnvironment' node_modules/enzyme/build/index.js > src/libs/enzyme/enzyme.js"
   },
   'nyc-instrument': {
-    cmd: 'node_modules/.bin/nyc instrument src/js/ test/coverage/instrument'
+    cmd: 'node_modules/.bin/nyc instrument dist/js/ test/coverage/instrument'
   },
   'coveralls-report': {
     cmd: 'cat test/coverage/reports/lcov/lcov.info | ./node_modules/coveralls/bin/coveralls.js'