Merge branch 'master', remote branch 'origin'

This commit is contained in:
Christian Williams & Jay Phillips 2010-07-21 18:55:55 -07:00
commit c6acfb3982

View File

@ -296,7 +296,7 @@ Here are a few examples:
}); });
it('should spy on Klass#methodWithCallback') { it('should spy on Klass#methodWithCallback') {
var callback = Jasmine.createSpy(); var callback = jasmine.createSpy();
Klass.methodWithCallback(callback); Klass.methodWithCallback(callback);
expect(callback).toHaveBeenCalledWith('foo'); expect(callback).toHaveBeenCalledWith('foo');
@ -316,7 +316,7 @@ Spies can be very useful for testing AJAX or other asynchronous behaviors that t
it('should test async call') { it('should test async call') {
spyOn(Klass, 'asyncMethod'); spyOn(Klass, 'asyncMethod');
var callback = Jasmine.createSpy(); var callback = jasmine.createSpy();
Klass.asyncMethod(callback); Klass.asyncMethod(callback);
expect(callback).not.toHaveBeenCalled(); expect(callback).not.toHaveBeenCalled();