Added ES6/babel to JS tests, exported babel reporting

diff --git a/gulp/babel-error.js b/gulp/babel-error.js
new file mode 100644 (file)
index 0000000..9e0a3f0
--- /dev/null
+++ b/gulp/babel-error.js
@@ -0,0 +1,16 @@
+var chalk = require('chalk');
+
+module.exports = function(err) {
+  console.log(
+    chalk.red(
+      err.fileName +
+      (
+          err.loc ?
+          '(' + err.loc.line + ',' + err.loc.column + '): ' :
+          ': '
+      )
+    ) +
+    'error Babel: ' + err.message + '\n' +
+    err.codeFrame
+  );
+}
\ No newline at end of file

diff --git a/gulp/javascript.js b/gulp/javascript.js
index f350f0a2f99a5364a6fcdb315d2543a2826cd8e5..fbbd9403cae7a43b25949a739eb0aefee3e62940 100644 (file)
--- a/gulp/javascript.js
+++ b/gulp/javascript.js
@@ -2,6 +2,7 @@ var gulp = require('gulp');
 var chalk = require('chalk');
 var concat = require('gulp-concat');
 var babel = require('gulp-babel');
+var onBabelError = require('./babel-error.js');
 
 var FOUNDATION = [
   'js/foundation.core.js',
@@ -30,7 +31,6 @@ gulp.task('javascript:foundation', function() {
   return gulp.src(FOUNDATION)
     .pipe(babel()
       .on('error', onBabelError))
-    .pipe(gulp.dest('_build/assets/js/plugins'))
     .pipe(concat('foundation.js'))
     .pipe(gulp.dest('_build/assets/js'));
 });
@@ -46,18 +46,3 @@ gulp.task('javascript:docs', function() {
     .pipe(concat('docs.js'))
     .pipe(gulp.dest('_build/assets/js'));
 });
-
-function onBabelError(err) {
-  console.log(
-    chalk.red(
-      err.fileName +
-      (
-          err.loc ?
-          '(' + err.loc.line + ',' + err.loc.column + '): ' :
-          ': '
-      )
-    ) +
-    'error Babel: ' + err.message + '\n' +
-    err.codeFrame
-  );
-}

diff --git a/gulp/test.js b/gulp/test.js
index 10ce500c93f27ddcfce17368e3cf0fe45afe81e1..4b67dd6a04d91c72b92557f241c4d2136f295008 100644 (file)
--- a/gulp/test.js
+++ b/gulp/test.js
@@ -2,9 +2,17 @@ var gulp = require('gulp');
 var opener = require('opener');
 var mocha = require('gulp-mocha');
 var browser = require('browser-sync');
+var concat = require('gulp-concat');
+var babel = require('gulp-babel');
+var onBabelError = require('./babel-error.js')
+
+var JSTESTS = [
+  'test/javascript/components/**/*.js',
+  'test/javascript/util/**/*.js'
+];
 
 // Runs unit tests
-gulp.task('test', ['sass:foundation', 'javascript:foundation', 'watch'], function() {
+gulp.task('test', ['sass:foundation', 'test:transpile-js', 'watch'], function() {
   browser.init({
     server: 'test/visual',
     directory: true
@@ -16,3 +24,11 @@ gulp.task('test:reload', function(done) {
   browser.reload();
   done();
 });
+
+gulp.task('test:transpile-js', ['javascript:foundation'], function() {
+  return gulp.src(JSTESTS)
+       .pipe(babel()
+               .on('error', onBabelError))
+       .pipe(concat('js-tests.js'))
+       .pipe(gulp.dest('test/javascript'));
+});

diff --git a/package.json b/package.json
index 2c92e16ad425996eff468bf3e266d7261dd73618..46a8a1750c030ae311d5a5ab83c0a22faf65f52e 100644 (file)
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "start": "gulp",
     "test": "npm run test:sass && npm run test:javascript",
     "test:sass": "mocha test/sass/test_sass.js",
-    "test:javascript": "gulp sass:foundation && gulp javascript:foundation && mocha-phantomjs test/javascript/index.html",
+    "test:javascript": "gulp sass:foundation && gulp test:transpile-js && mocha-phantomjs test/javascript/index.html",
     "test:visual": "gulp test",
     "deploy": "gulp deploy",
     "deploy:docs": "gulp deploy:docs"