Adds withArgument: arg as a shortcut for withArguments: [arg].

Manfred · Jan 4, 2010 · 66b6cea · 66b6cea
1 parent 00d96d4
commit 66b6cea
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/dist/moksi.js b/dist/moksi.js
@@ -278,6 +278,11 @@ Moksi.Expectations.Expectation = Class.create({
 
       var result, invocationCount, messageParts = [];
 
+      if (options.withArgument) {
+        options.withArguments = [options.withArgument];
+        delete options['withArgument'];
+      }
+
       invocationCount = Moksi.Invocations.invocationCount(subject, method, options.withArguments)
 
       if (options.times) {

diff --git a/examples/expected_invocation_test.js b/examples/expected_invocation_test.js
@@ -22,7 +22,7 @@ Moksi.describe('Updater', {
 
   'fetches book information from the correct URL': function() {
     expects(Ajax).receives('get', {
-      withArguments: ['http://example.com/books/12.json'],
+      withArgument: 'http://example.com/books/12.json',
       returns: { title: 'The Haunter of the Dark' }
     });
     this.suite.updater.run();

diff --git a/src/moksi/expectations.js b/src/moksi/expectations.js
@@ -95,6 +95,11 @@ Moksi.Expectations.Expectation = Class.create({
 
       var result, invocationCount, messageParts = [];
 
+      if (options.withArgument) {
+        options.withArguments = [options.withArgument];
+        delete options['withArgument'];
+      }
+
       invocationCount = Moksi.Invocations.invocationCount(subject, method, options.withArguments)
 
       if (options.times) {

diff --git a/test/unit/expectations_test.js b/test/unit/expectations_test.js
@@ -563,6 +563,11 @@ Moksi.describe('Moksi.Expectations.Expectation, concerning receives', Object.ext
     expects(this.suite.resolver.results[0].message).equals('expected ‘[object Object]’ to not receive ‘hasFriend(Manfred)’ 2 times, but was 2 times');
   },
 
+  'uses withArgument: arg as a shortcut for withArguments: [arg]': function() {
+    expects(Person).receives('hasFriend', { withArgument: 'Manfred' });
+    Person.hasFriend('Manfred');
+  },
+
   'returns no value from the stubbed function': function() {
     var expectation = new Moksi.Expectations.Expectation(Person, true, this.suite.resolver);
     expectation.receives('name');