Permalink
Browse files

Merge branch 'preset-template' of https://github.com/nathanmacinnes/p…

…retendr into preset-template

Conflicts:
	lib/pretendr.js
	test/spec.js
  • Loading branch information...
2 parents b166dd9 + 294a240 commit fc013ea481ce58a4fecf9a73230b1db5ebe97f7f @nathanmacinnes committed Aug 2, 2012
Showing with 3 additions and 4 deletions.
  1. +1 −2 lib/pretendr.js
  2. +2 −2 test/spec.js
View
@@ -27,8 +27,7 @@ makeTemplate = function (t) {
p;
p = this.apply(pretendr(t, o));
for (i in t) {
- if (t.hasOwnProperty(i) &&
- (typeof t[i] === 'object' ||
+ if (t.hasOwnProperty(i) && (typeof t[i] === 'object' ||
typeof t[i] === 'function')) {
this[i].apply(p[i]);
}
View
@@ -212,7 +212,7 @@ describe("pretendr", function () {
res = m.mock();
res();
expect(fake.calls).to.have.length(1);
- });
+ });
it("should be able to have a template of its own", function () {
var m = this.pretendr(function () {}),
res,
@@ -223,7 +223,7 @@ describe("pretendr", function () {
res = m.mock();
res = res();
expect(res).to.have.property('a', 'b');
- });
+ });
it("should be deep like pretendr objects", function () {
var m = this.pretendr(function () {}),
res,

0 comments on commit fc013ea

Please sign in to comment.