Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
language: node_js
sudo: false

language: node_js

node_js:
- "0.12"
- "4.1"
- "5"
- "6"

install:
- npm install

script:
- npm run test
- npm run lint

# Necessary to compile native modules for io.js v3 or Node.js v4
env:
- CXX=g++-4.8

# Necessary to compile native modules for io.js v3 or Node.js v4
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,25 @@
"matador": "bin/matador.js"
},
"dependencies": {
"body-parser": "^1.13.1",
"connect": "^3.4.0",
"cookies": "^0.5.0",
"cookie-parser": "^1.3.5",
"errorhandler": "^1.4.0",
"qs": "^3.1.0",
"body-parser": "^1.15.1",
"connect": "^3.4.1",
"cookies": "^0.6.1",
"cookie-parser": "^1.4.3",
"errorhandler": "^1.4.3",
"qs": "^6.2.0",
"soynode": "^1.1.0",
"serve-static": "^1.10.0",
"useragent": "^2.1.7",
"valentine": "1.8.0"
"serve-static": "^1.11.0",
"useragent": "^2.1.9",
"valentine": "2.1.4"
},
"devDependencies": {
"jshint": "2.0.1",
"falkor": "~1.2.9",
"nodeunit": "~0.8.0",
"semver": "~4.2.0"
"jshint": "2.9.2",
"falkor": "~1.5.3",
"nodeunit": "~0.9.1",
"semver": "~5.1.0"
},
"scripts": {
"test": "node_modules/nodeunit/bin/nodeunit tests/functional/ tests/unit/ && ./runIntegrationTests.sh",
"lint": "node_modules/jshint/bin/hint src/ --reporter dev/reporter.js"
"test": "nodeunit tests/functional/ tests/unit/ && ./runIntegrationTests.sh",
"lint": "jshint src/ --reporter dev/reporter.js"
}
}
2 changes: 1 addition & 1 deletion src/TemplateEngine.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ TemplateEngine.prototype.precompileTemplates = function (searchPaths, options, c
if (err) {
callback(err)
callback = nullFunction
} else if (pathsLeft == 0) {
} else if (pathsLeft === 0) {
callback()
callback = nullFunction
}
Expand Down