Refactor testing frameworks

.jshintrc

@@ -4,7 +4,7 @@
     "eqeqeq"        : true,
     "forin"         : false,
     "immed"         : true,
-    "latedef"       : true,
+    "latedef"       : "nofunc",
     "newcap"        : true,
     "noarg"         : true,
     "noempty"       : true,
@@ -58,7 +58,14 @@
     "passfail"      : false,
     "white"         : false,
 
-    "predef"       : [
-      "define"
-    ]
+    "globals"       : {
+      "define"      : false,
+      "describe"    : false,
+      "expect"      : false,
+      "it"          : false,
+      "beforeEach"  : false,
+      "afterEach"   : false,
+      "beforeAll"   : false,
+      "afterAll"    : false
+    }
 }

Gruntfile.js

@@ -1,59 +1,38 @@
-/*global module:false,__dirname:true*/
 module.exports = function(grunt) {
   //--------------------------------------------------
   //------------Project config------------------------
   //--------------------------------------------------
+  var pkg = grunt.file.readJSON('package.json');
   grunt.initConfig({
     // Metadata.
-    pkg: grunt.file.readJSON('package.json'),
+    pkg: pkg,
     banner: '/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %>\n' +
       '<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
       '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
       ' Released under the <%= pkg.license %> License */\n',
     // Task configuration.
-    shell: {
-      oldTests: {
-        command: 'node test/server.js',
+    peg: {
+      parser: {
+        src: 'src/dust.pegjs',
+        dest: 'lib/parser.js',
         options: {
-          stdout: true,
-          failOnError: true
-        }
-      },
-      testRhino : {
-        command : function() {
-          var commandList = [],
-            fs = require('fs'),
-            rhinoFolder = 'test/rhino/';
-          fs.readdirSync(__dirname  + '/' + rhinoFolder + 'lib').forEach( function(rhinoJar) {
-            if(rhinoJar.indexOf('.jar') >= 0) {
-              commandList.push('java -jar ' + rhinoFolder + 'lib/' + rhinoJar + ' -f ' + rhinoFolder + 'rhinoTest.js');
-            }
-          });
-          return commandList.join(' && ');
-        },
-        options : {
-          stdout: true,
-          failOnError: true
-        }
-      },
-      // these are old that should eventually be rewritten to take advantage of grunt and the current build process
-      buildParser: {
-        command: 'node src/build.js',
-        options: {
-          stdout: true
+          wrapper: function(src, parser) {
+            var buildMsg = 'Do not edit this file directly. It is automatically generated from src/dust.pegjs';
+            var wrapper = grunt.file.read("src/umdParserWrapper.js").replace('@@build', buildMsg).split('@@parser');
+            return wrapper[0] + parser + wrapper[1];
+          }
         }
-      },
-      bench: {
-        command: 'node benchmark/server.js',
+      }
+    },
+    execute: {
+      testRhino: {
+        src: 'node_modules/.bin/rhino*',
         options: {
-          stdout: true
+          args: ['-f', 'test/rhino.spec.js']
         }
       },
-      doc: {
-        command: 'node docs/build.js',
-        options: {
-          stdout: true
-        }
+      buildParser: {
+        src: 'src/build.js'
       }
     },
     concat: {
@@ -120,7 +99,7 @@ module.exports = function(grunt) {
         src: 'Gruntfile.js'
       },
       libs: {
-        src: ['lib/**/*.js', 'src/**/*.js', '!lib/parser.js'] // don't hint the parser which is autogenerated from pegjs
+        src: ['lib/**/*.js', '!lib/parser.js'] // don't hint the parser which is autogenerated from pegjs
       }
     },
     connect: {
@@ -132,26 +111,19 @@ module.exports = function(grunt) {
      }
     },
     jasmine: {
+      options: {
+        keepRunner: false,
+        display: 'short',
+        specs: ['test/templates/all.js', 'test/helpers/template.helper.js', 'test/templates.spec.js'],
+        vendor: ['node_modules/ayepromise/ayepromise.js', 'test/lib/highland.js']
+      },
       /*tests production (minified) code*/
       testProd: {
-        src: 'tmp/dust-full.min.js',
-        options: {
-          keepRunner: false,
-          display: 'short',
-          helpers: ['test/jasmine-test/spec/coreTests.js'],
-          specs: ['test/jasmine-test/spec/testHelpers.js', 'test/jasmine-test/spec/renderTestSpec.js'],
-          vendor: ['node_modules/ayepromise/ayepromise.js', 'test/lib/highland.js']
-        }
+        src: 'tmp/dust-full.min.js'
       },
       /*tests unminified code, mostly used for debugging by `grunt dev` task*/
       testDev : {
-        src: 'tmp/dust-full.js',
-        options: {
-          keepRunner: false,
-          helpers: '<%=jasmine.testProd.options.helpers%>',
-          specs : '<%=jasmine.testProd.options.specs%>',
-          vendor: '<%=jasmine.testProd.options.vendor%>'
-        }
+        src: 'tmp/dust-full.js'
       },
       /*runs unit tests with jasmine and collects test coverage info via istanbul template
       * tests unminified version of dust to make sure test coverage starts are correctly calculated
@@ -161,11 +133,7 @@ module.exports = function(grunt) {
       coverage : {
         src: 'tmp/dust-full.js',
         options: {
-          keepRunner: false,
           display: 'none',
-          helpers: '<%=jasmine.testProd.options.helpers%>',
-          specs : '<%=jasmine.testProd.options.specs%>',
-          vendor: '<%=jasmine.testProd.options.vendor%>',
           template: require('grunt-template-jasmine-istanbul'),
           templateOptions: {
             coverage: 'tmp/coverage/coverage.json',
@@ -181,27 +149,27 @@ module.exports = function(grunt) {
       }
     },
     jasmine_nodejs: {
-      cjs: {
-        specs: ['test/jasmine-test/spec/cjsSpec.js'],
-        options: {
-          reporters: {
-            console: {
-              colors: false,
-              verbose: false
-            }
+      options: {
+        useHelpers: true,
+        reporters: {
+          console: {
+            colors: false,
+            verbosity: 0
           }
         }
       },
+      core: {
+        specs: ['test/core.spec.js']
+      },
+      cjs: {
+        specs: ['test/commonJS.spec.js']
+      },
       dustc: {
-        specs: ['test/jasmine-test/spec/cli/*'],
-        options: {
-          reporters: {
-            console: {
-              colors: false,
-              verbose: false
-            }
-          }
-        }
+        helpers: ['test/cli/matchers.helper.js'],
+        specs: ['test/cli/*']
+      },
+      templates: {
+        specs: ['test/templates.spec.js']
       }
     },
     watch: {
@@ -214,7 +182,7 @@ module.exports = function(grunt) {
         tasks: ['jshint:gruntfile']
       },
       lib_test: {
-        files: ['<%= jshint.libs.src %>', '<%= jasmine.testProd.options.specs %>'],
+        files: ['<%= jshint.libs.src %>', '<%= jasmine.options.specs %>'],
         tasks: ['testPhantom']
       }
     },
@@ -285,24 +253,24 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-connect');
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadNpmTasks('grunt-gh-pages');
   grunt.loadNpmTasks('grunt-bump');
-  grunt.loadNpmTasks('grunt-shell');
+  grunt.loadNpmTasks('grunt-execute');
+  grunt.loadNpmTasks('grunt-peg');
   grunt.loadNpmTasks('grunt-jasmine-nodejs');
   grunt.loadNpmTasks('grunt-github-changes');
 
   //--------------------------------------------------
   //------------Grunt task aliases -------------------
   //--------------------------------------------------
   grunt.registerTask('buildLib',       ['jshint:libs', 'concat']);
-  grunt.registerTask('build',          ['clean:build', 'shell:buildParser', 'buildLib', 'uglify']);
+  grunt.registerTask('build',          ['clean:build', 'peg', 'buildLib', 'uglify']);
 
   //test tasks
-  grunt.registerTask('testNode',       ['jasmine_nodejs:cjs', 'shell:oldTests']);
-  grunt.registerTask('testRhino',      ['build', 'shell:testRhino']);
+  grunt.registerTask('testNode',       ['jasmine_nodejs:templates', 'jasmine_nodejs:core', 'jasmine_nodejs:cjs']);
+  grunt.registerTask('testRhino',      ['build', 'execute:testRhino']);
   grunt.registerTask('testPhantom',    ['build', 'jasmine:testProd']);
   grunt.registerTask('testCli',        ['jasmine_nodejs:dustc']);
-  grunt.registerTask('test',           ['build', 'jasmine:testProd', 'testCli', 'testNode', 'shell:testRhino', 'jasmine:coverage']);
+  grunt.registerTask('test',           ['build', 'jasmine:testProd', 'testCli', 'testNode', 'execute:testRhino', 'jasmine:coverage']);
 
   //decide whether to run all tests or just the Node tests for Travis CI
   grunt.registerTask('travis',         (process.env.TEST === 'all') ? ['test'] : ['testNode', 'testCli']);
@@ -317,7 +285,7 @@ module.exports = function(grunt) {
   grunt.registerTask('coverage',       ['build', 'jasmine:coverage', 'log:coverage']);
 
   //release tasks
-  grunt.registerTask('copyForRelease', ['clean:dist', 'copy:core', 'copy:coreMin', 'copy:full', 'copy:fullMin', 'copy:license', 'log:copyForRelease']);
+  grunt.registerTask('copyForRelease', ['clean:dist', 'copy', 'log:copyForRelease']);
   grunt.registerTask('buildRelease',   ['test', 'githubChanges', 'copyForRelease']);
   grunt.registerTask('releasePatch',   ['bump-only:patch', 'buildRelease', 'bump-commit', 'log:release']);
   grunt.registerTask('releaseMinor',   ['bump-only:minor', 'buildRelease', 'bump-commit', 'log:release']);

README.md

@@ -5,9 +5,11 @@ Asynchronous Javascript templating for the browser and server. This fork is main
 
 ### NPM
 
+**Important**: We recommend that you lock your version of Dust to a specific minor version, instead of a major version. By default, NPM will add `"dustjs-linkedin": "^2.x.y"` to your package.json, which will install new minor versions automatically.
+
     npm install --save --production dustjs-linkedin
     # If you want the dustc compiler available globally
-    npm install -g dustjs-linkedin
+    npm install --global --production dustjs-linkedin
 
 If you want to add the [Dust helpers](https://github.com/linkedin/dustjs-helpers) or [secure filters](https://github.com/linkedin/dustjs-filters-secure):
 

lib/compiler.js

@@ -1,4 +1,3 @@
-/*jshint latedef:false */
 (function(root, factory) {
   if (typeof define === "function" && define.amd && define.amd.dust === true) {
     define("dust.compile", ["dust.core", "dust.parse"], function(dust, parse) {

lib/dust.js

@@ -1,5 +1,4 @@
 (function (root, factory) {
-  /*global define*/
   if (typeof define === 'function' && define.amd && define.amd.dust === true) {
     define('dust.core', [], factory);
   } else if (typeof exports === 'object') {

lib/parser.js

@@ -1,4 +1,4 @@
-/* Do not edit the parser directly. This is a generated file created using a build script and the PEG grammar. */
+/* Do not edit this file directly. It is automatically generated from src/dust.pegjs */
 (function(root, factory) {
   if (typeof define === "function" && define.amd && define.amd.dust === true) {
     define("dust.parse", ["dust.core"], function(dust) {

package.json

@@ -55,14 +55,16 @@
     "grunt-contrib-jshint": "~0.11.1",
     "grunt-contrib-uglify": "~0.8.0",
     "grunt-contrib-watch": "~0.6.1",
-    "grunt-gh-pages": "~0.10.0",
+    "grunt-execute": "~0.2.2",
     "grunt-github-changes": "~0.0.6",
-    "grunt-jasmine-nodejs": "~1.0.2",
+    "grunt-jasmine-nodejs": "~1.4.0",
+    "grunt-peg": "~1.5.0",
     "grunt-shell": "~1.1.2",
     "grunt-template-jasmine-istanbul": "~0.3.3",
     "highland": "2.4.0",
-    "jasmine": "~2.2.1",
     "pegjs": "0.8.0",
+    "rhino-1_7r3-bin": "~1.0.1",
+    "rhino-1_7r5-bin": "~1.0.1",
     "tmp": "0.0.25"
   },
   "license": "MIT",

src/umdParserWrapper.js

@@ -1,4 +1,4 @@
-/* BUILD_MESSAGE_HERE */
+/* @@build */
 (function(root, factory) {
   if (typeof define === "function" && define.amd && define.amd.dust === true) {
     define("dust.parse", ["dust.core"], function(dust) {
@@ -13,7 +13,7 @@
     factory(root.dust);
   }
 }(this, function(dust) {
-  var parser = 'PARSER_CODE_HERE';
+  var parser = @@parser;
 
   // expose parser methods
   dust.parse = parser.parse;

test/jasmine-test/spec/cli/cliSpec.js → test/cli/cli.spec.js

@@ -1,17 +1,15 @@
-/*global describe,expect,it,afterEach */
+/*jshint unused:false*/
 var path = require('path'),
     fs = require('fs'),
     exec = require('child_process').exec;
 
-var ROOT_DIR = path.resolve(__dirname, '../../../../'),
+var ROOT_DIR = path.resolve(__dirname, '../../'),
     BIN_DIR = path.join(ROOT_DIR, 'bin'),
     TMP_DIR = require('tmp').dirSync().name,
     FIXTURE_DIR = path.join(__dirname, 'fixtures');
 
 var packageJson = require(path.join(ROOT_DIR, 'package.json'));
 
-require('./lib/matchers.js');
-
 describe('dustc', function() {
 
 describe('template piped from stdin', function() {

test/jasmine-test/spec/cli/lib/matchers.js → test/cli/matchers.helper.js

@@ -1,5 +1,5 @@
 var fs = require('fs'),
-  dust = require('../../../../../lib/dust');
+    dust = require('../../');
 
 var matchers = {};