Skip to content

Commit

Permalink
Merge branch 'master', remote branch 'origin'
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Williams & Jay Phillips committed Jul 22, 2010
2 parents 0331209 + ba5bd3f commit c6acfb3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions README.markdown
Expand Up @@ -296,7 +296,7 @@ Here are a few examples:
});

it('should spy on Klass#methodWithCallback') {
var callback = Jasmine.createSpy();
var callback = jasmine.createSpy();
Klass.methodWithCallback(callback);

expect(callback).toHaveBeenCalledWith('foo');
Expand All @@ -316,7 +316,7 @@ Spies can be very useful for testing AJAX or other asynchronous behaviors that t

it('should test async call') {
spyOn(Klass, 'asyncMethod');
var callback = Jasmine.createSpy();
var callback = jasmine.createSpy();

Klass.asyncMethod(callback);
expect(callback).not.toHaveBeenCalled();
Expand Down

0 comments on commit c6acfb3

Please sign in to comment.