Add tests for call return value tracking

jasmine · Dec 8, 2013 · b1d4ab0 · b1d4ab0
1 parent 3b52d01
commit b1d4ab0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/spec/core/SpySpec.js b/spec/core/SpySpec.js
@@ -47,6 +47,16 @@ describe('Spies', function () {
 
       expect(trackSpy.calls.mostRecent().args[0].object).toEqual(contextObject);
     });
+
+    it("tracks the return value of calls", function () {
+      var spy = j$.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
+      var trackSpy = spyOn(spy.calls, "track");
+
+      spy.and.returnValue("return value");
+      spy();
+
+      expect(trackSpy.calls.mostRecent().args[0].returnValue).toEqual("return value");
+    });
   });
 
   describe("createSpyObj", function() {

diff --git a/spec/core/integration/EnvSpec.js b/spec/core/integration/EnvSpec.js
@@ -205,9 +205,14 @@ describe("Env integration", function() {
       var env = new j$.Env();
 
       var originalFunctionWasCalled = false;
-      var subject = { spiedFunc: function() { originalFunctionWasCalled = true; } };
+      var subject = {
+        spiedFunc: function() {
+          originalFunctionWasCalled = true;
+          return "original result";
+        }
+      };
 
-      var spy = env.spyOn(subject, 'spiedFunc');
+      var spy = env.spyOn(subject, 'spiedFunc').and.returnValue("stubbed result");
 
       expect(subject.spiedFunc).toEqual(spy);
 
@@ -220,11 +225,15 @@ describe("Env integration", function() {
       expect(subject.spiedFunc.calls.count()).toEqual(1);
       expect(subject.spiedFunc.calls.mostRecent().args).toEqual(['foo']);
       expect(subject.spiedFunc.calls.mostRecent().object).toEqual(subject);
+      expect(subject.spiedFunc.calls.mostRecent().returnValue).toEqual("stubbed result");
       expect(originalFunctionWasCalled).toEqual(false);
 
+      subject.spiedFunc.and.callThrough();
       subject.spiedFunc('bar');
       expect(subject.spiedFunc.calls.count()).toEqual(2);
       expect(subject.spiedFunc.calls.mostRecent().args).toEqual(['bar']);
+      expect(subject.spiedFunc.calls.mostRecent().returnValue).toEqual("original result");
+      expect(originalFunctionWasCalled).toEqual(true);
   });
 
   it("Mock clock can be installed and used in tests", function(done) {