[Finishes #45476285] Add timeout support to async tests

This commit is contained in:
Colin O'Byrne and JR Boyens
2013-07-23 16:43:42 -07:00
parent 9609aba25f
commit 8f5d0beb8c
6 changed files with 95 additions and 8 deletions

View File

@@ -15,6 +15,8 @@ describe('Spies', function () {
});
it("warns the user that we indend to overwrite an existing property", function() {
TestClass.prototype.someFunction.and = "existing";
expect(function() {
j$.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
}).toThrowError("Jasmine spies would overwrite the 'and' and 'calls' properties on the object being spied upon");
@@ -23,8 +25,8 @@ describe('Spies', function () {
it("adds a spyStrategy and callTracker to the spy", function() {
var spy = j$.createSpy(TestClass.prototype, TestClass.prototype.someFunction);
expect(spy.and).toEqual(jasmine.any(j$.SpyStrategy);
expect(spy.calls).toEqual(jasmine.any(j$.CallTracker);
expect(spy.and).toEqual(jasmine.any(j$.SpyStrategy));
expect(spy.calls).toEqual(jasmine.any(j$.CallTracker));
});
});