Upgrade tests to ES2015. Refs #15

Author: nwronski

Gruntfile.js

@@ -6,6 +6,7 @@ module.exports = function(grunt) {
      ' * @author Nick Wronski <nick@javascript.com>\n' +
      ' */';
   }
+  const mochaCmd = './node_modules/.bin/mocha --compilers js:babel-core/register';
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
     browserify: {
@@ -103,27 +104,27 @@ module.exports = function(grunt) {
         options: {
           failOnError: true
         },
-        command: './node_modules/.bin/pegjs --optimize speed src/grammar.pegjs lib/parser.js'
+        command: './node_modules/.bin/pegjs -e parser --optimize speed src/grammar.pegjs .tmp/parser.js'
       },
       test: {
         options: {
           failOnError: true
         },
-        command: './node_modules/.bin/mocha --reporter=nyan'
+        command: `${mochaCmd} --reporter=nyan`
       },
       debug: {
         options: {
           failOnError: false,
           debounceDelay: 500,
           forever: true
         },
-        command: 'DEBUG=true ./node_modules/.bin/mocha'
+        command: `DEBUG=true ${mochaCmd}`
       },
       rewrite: {
         options: {
           failOnError: true
         },
-        command: 'REWRITE=true ./node_modules/.bin/mocha'
+        command: `REWRITE=true ${mochaCmd}`
       }
     },
     connect: {
@@ -136,6 +137,17 @@ module.exports = function(grunt) {
       }
     },
     watch: {
+      test: {
+        options: {
+          debounceDelay: 250,
+          livereload: false
+        },
+        files: [
+          'index.js', 'test/**/*.js', 'src/*.js', 'src/*.pegjs',
+          'test/sql/**/*.sql', 'test/json/**/*.json', 'Gruntfile.js'
+        ],
+        tasks: ['build', 'shell:test']
+      },
       debug: {
         options: {
           debounceDelay: 250,
@@ -252,6 +264,9 @@ module.exports = function(grunt) {
   grunt.registerTask('test', [
     'build', 'shell:test'
   ]);
+  grunt.registerTask('test-watch', [
+    'test', 'watch:test'
+  ]);
   grunt.registerTask('debug', [
     'build', 'shell:debug', 'watch:debug'
   ]);

test/helpers.js

@@ -1,16 +1,18 @@
-var expect            = require('chai').expect,
-    fs                = require('fs'),
-    Promise           = require('promise'),
-    read              = Promise.denodeify(fs.readFile),
-    write             = Promise.denodeify(fs.writeFile),
-    _                 = require('lodash'),
-    parser            = require('../index'),
-    sqliteParser      = Promise.denodeify(parser),
-    prettyjson        = require('prettyjson'),
-    format, broadcast,
+import {expect} from 'chai';
+import {readFile, writeFile} from 'fs';
+import {all, promisify} from 'bluebird';
+import _ from 'lodash';
+import parser from '../index';
+import prettyjson from 'prettyjson';
+
+const read = promisify(readFile);
+const write = promisify(writeFile);
+const sqliteParser = promisify(parser);
+
+let format, broadcast,
     filePath,
     getTree, getTestJson, getTestFiles,
-    assertOkTree, assertErrorTree,
+    assertOkTree, assertErrorTree, assertEqualsTree,
     isDefined = function (arg) { return arg != null; };
 
 broadcast = function broadcast(args) {
@@ -65,7 +67,7 @@ getTestJson = function (that) {
 
 getTestFiles = function (that) {
   var getFiles = function () {
-    return Promise.all([getTree(that), getTestJson(that)]);
+    return all([getTree(that), getTestJson(that)]);
   };
   if (_.has(process.env, 'REWRITE')) {
     // REWRITE MODE: Save a new JSON file using parser tree result

test/index.js

@@ -1 +1,2 @@
-global.tree = require('./helpers');
+import * as tree from './helpers';
+global.tree = tree;