diff options
| -rw-r--r-- | docs/compiler-api.md | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | tasks/test.js | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/docs/compiler-api.md b/docs/compiler-api.md index 2938219..c9d2e93 100644 --- a/docs/compiler-api.md +++ b/docs/compiler-api.md @@ -66,7 +66,7 @@ interface MustacheStatement <: Statement { interface BlockStatement <: Statement { type: "BlockStatement"; - path: PathExpression; + path: PathExpression | Literal; params: [ Expression ]; hash: Hash; diff --git a/package.json b/package.json index 9d37d8a..0918ff4 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "grunt-saucelabs": "8.x", "grunt-webpack": "^1.0.8", "istanbul": "github:kpdecker/istanbul", - "jison": "~0.3.0", + "jison": "0.4.16", "mocha": "~1.20.0", "mock-stdin": "^0.3.0", "mustache": "^2.1.3", diff --git a/tasks/test.js b/tasks/test.js index 18a6c26..803fef9 100644 --- a/tasks/test.js +++ b/tasks/test.js @@ -5,13 +5,14 @@ module.exports = function(grunt) { grunt.registerTask('test:bin', function() { var done = this.async(); - childProcess.exec('./bin/handlebars -a spec/artifacts/empty.handlebars', function(err, stdout) { + childProcess.exec('node ./bin/handlebars -a spec/artifacts/empty.handlebars', function(err, stdout) { if (err) { throw err; } - var expected = fs.readFileSync('./spec/expected/empty.amd.js'); - if (stdout.toString() !== expected.toString()) { + var expected = fs.readFileSync('./spec/expected/empty.amd.js').toString().replace(/\r\n/g, '\n'); + + if (stdout.toString() !== expected) { throw new Error('Expected binary output differed:\n\n"' + stdout + '"\n\n"' + expected + '"'); } |