Skip to content

Commit

Permalink
mocha
Browse files Browse the repository at this point in the history
  • Loading branch information
tj committed Dec 9, 2011
1 parent e6d289e commit eedc9a0
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ SRC = $(shell find lib -name "*.js" -type f)
UGLIFY_FLAGS = --no-mangle

test:
@./node_modules/.bin/expresso test/*.test.js
@./node_modules/.bin/mocha \
--ui exports

ejs.js: $(SRC)
@node support/compile.js $^
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"author": "TJ Holowaychuk <tj@vision-media.ca>",
"keywords": ["template", "engine", "ejs"],
"devDependencies": {
"expresso": "0.9.2"
"mocha": "*"
},
"main": "./lib/ejs.js"
}
16 changes: 8 additions & 8 deletions test/ejs.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,11 @@ module.exports = {

try {
ejs.render(str)
} catch( err ){
assert.includes(err.message,"name is not defined");
assert.eql(err.name,"ReferenceError");
} catch (err) {
assert.ok(~err.message.indexOf("name is not defined"));
assert.deepEqual(err.name, "ReferenceError");
var lineno = parseInt(err.toString().match(/ejs:(\d+)\n/)[1]);
assert.eql(lineno,3,"Error should been thrown on line 3, was thrown on line "+lineno);
assert.deepEqual(lineno,3, "Error should been thrown on line 3, was thrown on line "+lineno);
}
},

Expand All @@ -259,11 +259,11 @@ module.exports = {

try {
ejs.render(str)
} catch( err ){
assert.includes(err.message,"name is not defined");
assert.eql(err.name,"ReferenceError");
} catch (err) {
assert.ok(~err.message.indexOf("name is not defined"));
assert.deepEqual(err.name, "ReferenceError");
var lineno = parseInt(err.toString().match(/ejs:(\d+)\n/)[1]);
assert.eql(lineno,6,"Error should been thrown on line 3, was thrown on line "+lineno);
assert.deepEqual(lineno, 6, "Error should been thrown on line 3, was thrown on line "+lineno);
}
}
};

0 comments on commit eedc9a0

Please sign in to comment.