Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore the call and apply methods when adding a chainable method #140

Merged
merged 1 commit into from
Feb 15, 2013
Merged

Restore the call and apply methods when adding a chainable method #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion lib/chai/utils/addChainableMethod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ var hasProtoSupport = '__proto__' in Object;
// and there seems no easy cross-platform way to detect them (@see chaijs/chai/issues/69).
var excludeNames = /^(?:length|name|arguments|caller)$/;

// Cache `Function` properties
var call = Function.prototype.call,
apply = Function.prototype.apply;

/**
* ### addChainableMethod (ctx, name, method, chainingBehavior)
*
Expand Down Expand Up @@ -65,7 +69,11 @@ module.exports = function (ctx, name, method, chainingBehavior) {

// Use `__proto__` if available
if (hasProtoSupport) {
assert.__proto__ = this;
// Inherit all properties from the object by replacing the `Function` prototype
var prototype = assert.__proto__ = Object.create(this);
// Restore the `call` and `apply` methods from `Function`
prototype.call = call;
prototype.apply = apply;
}
// Otherwise, redefine all properties (slow!)
else {
Expand Down
9 changes: 9 additions & 0 deletions test/utilities.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ suite('utilities', function () {
new chai.Assertion(this._obj).to.be.equal('x');
}
, function () {
this._obj = this._obj || {};
this._obj.__x = 'X!'
}
);
Expand All @@ -228,6 +229,14 @@ suite('utilities', function () {
expect("foo").x();
}).to.throw(_chai.AssertionError);

// Verify whether the original Function properties are present.
// see https://github.com/chaijs/chai/commit/514dd6ce4#commitcomment-2593383
var propertyDescriptor = Object.getOwnPropertyDescriptor(chai.Assertion.prototype, "x");
expect(propertyDescriptor.get).to.have.property("call", Function.prototype.call);
expect(propertyDescriptor.get).to.have.property("apply", Function.prototype.apply);
expect(propertyDescriptor.get()).to.have.property("call", Function.prototype.call);
expect(propertyDescriptor.get()).to.have.property("apply", Function.prototype.apply);

var obj = {};
expect(obj).x.to.be.ok;
expect(obj).to.have.property('__x', 'X!');
Expand Down