@@ -1,5 +1,5 @@
Screw.Matchers.argWhichWill = function(matcher, expected) {
- return {argumentMatcher: true, matcher: matcher, expected: expected};
+ return new Screw.Stub.ArgumentMatcher(matcher, expected);
};
Screw.Stub = (function() {
@@ -29,7 +29,7 @@ Screw.Stub = (function() {
self.accepts = function() {
return true;
- }
+ };
obj[name].stubs.push(self);
return self;
@@ -67,9 +67,9 @@ Screw.Stub = (function() {
for (var i=0; i < args.length; i++) {
var expected = private.expectedArguments[i];
var actual = args[i];
- if (expected.argumentMatcher) {
+ if (expected instanceof Screw.Stub.ArgumentMatcher) {
if (!expected.matcher.match(expected.expected, actual))
- return false;
+ return false;
} else if (actual !== expected) {
return false;
}
@@ -160,6 +160,11 @@ Screw.Stub = (function() {
}
};
+ self.ArgumentMatcher = function(matcher, expected) {
+ this.matcher = matcher;
+ this.expected = expected;
+ };
+
return self;
}());
lib/screw.stub.js
@@ -68,7 +68,15 @@ Screw.Unit(function() {
expect(obj.pizza("cheese")).to(equal, "yummy");
expect(obj.pizza.validate).to_not(raise);
});
-
+
+ it("should correctly match null values in specified argument list", function() {
+ obj.pizza = function() { return "gross" };
+ Screw.Stub.shouldReceive(obj, "pizza").withArguments(null, "cheese").andReturn("null yummy");
+ expect(obj.pizza()).to(equal, "gross");
+ expect(obj.pizza(null, "cheese")).to(equal, "null yummy");
+ expect(obj.pizza.validate).to_not(raise);
+ });
+
it("should match arguments using matchers", function() {
Screw.Stub.shouldReceive(obj, "pizza").withArguments(argWhichWill(match, /sausage/));
obj.pizza("turkey sausage");
spec/stub_spec.js
5a18badee9c78ce264025d1cf0c1084f2f1709fe
Mat Schaffer
mat.schaffer@gmail.com
http://github.com/tobowers/screw-unit/commit/c912bee393e897ddc0bfd8fecf8ac6442915db7a
c912bee393e897ddc0bfd8fecf8ac6442915db7a
2009-05-28T14:13:48-07:00
2009-05-28T14:13:48-07:00
Corrected handling of withArguments to support argument lists that contained a null value.
998c11d49ebcdc441927e6949c6557150aabfefb
Mat Schaffer
mat.schaffer@gmail.com