mirror of
https://github.com/zhigang1992/angular.js.git
synced 2026-04-20 07:15:31 +08:00
Rename deprecated wasCalled() -> toHaveBeenCalled() in all specs
As well as wasNotCalled(), wasCalledWith(), wasNotCalledWith()
This commit is contained in:
@@ -78,10 +78,10 @@ describe("resource", function() {
|
||||
|
||||
var cc = CreditCard.save({name:'misko'}, callback);
|
||||
nakedExpect(cc).toEqual({name:'misko'});
|
||||
expect(callback).wasNotCalled();
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
xhr.flush();
|
||||
nakedExpect(cc).toEqual({id:123, name:'misko'});
|
||||
expect(callback).wasCalledWith(cc);
|
||||
expect(callback).toHaveBeenCalledWith(cc);
|
||||
});
|
||||
|
||||
it("should read resource", function(){
|
||||
@@ -89,10 +89,10 @@ describe("resource", function() {
|
||||
var cc = CreditCard.get({id:123}, callback);
|
||||
expect(cc instanceof CreditCard).toBeTruthy();
|
||||
nakedExpect(cc).toEqual({});
|
||||
expect(callback).wasNotCalled();
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
xhr.flush();
|
||||
nakedExpect(cc).toEqual({id:123, number:'9876'});
|
||||
expect(callback).wasCalledWith(cc);
|
||||
expect(callback).toHaveBeenCalledWith(cc);
|
||||
});
|
||||
|
||||
it("should read partial resource", function(){
|
||||
@@ -106,7 +106,7 @@ describe("resource", function() {
|
||||
expect(cc.number).not.toBeDefined();
|
||||
cc.$get(callback);
|
||||
xhr.flush();
|
||||
expect(callback).wasCalledWith(cc);
|
||||
expect(callback).toHaveBeenCalledWith(cc);
|
||||
expect(cc.number).toEqual('9876');
|
||||
});
|
||||
|
||||
@@ -115,7 +115,7 @@ describe("resource", function() {
|
||||
|
||||
var cc = CreditCard.save({id:{key:123}, name:'misko'}, callback);
|
||||
nakedExpect(cc).toEqual({id:{key:123}, name:'misko'});
|
||||
expect(callback).wasNotCalled();
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
xhr.flush();
|
||||
});
|
||||
|
||||
@@ -124,10 +124,10 @@ describe("resource", function() {
|
||||
|
||||
var ccs = CreditCard.query({key:'value'}, callback);
|
||||
expect(ccs).toEqual([]);
|
||||
expect(callback).wasNotCalled();
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
xhr.flush();
|
||||
nakedExpect(ccs).toEqual([{id:1}, {id:2}]);
|
||||
expect(callback).wasCalledWith(ccs);
|
||||
expect(callback).toHaveBeenCalledWith(ccs);
|
||||
});
|
||||
|
||||
it("should have all arguments optional", function(){
|
||||
@@ -143,14 +143,14 @@ describe("resource", function() {
|
||||
xhr.expectDELETE("/CreditCard/123").respond(200, {});
|
||||
|
||||
CreditCard.remove({id:123}, callback);
|
||||
expect(callback).wasNotCalled();
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
xhr.flush();
|
||||
nakedExpect(callback.mostRecentCall.args).toEqual([{}]);
|
||||
|
||||
callback.reset();
|
||||
xhr.expectDELETE("/CreditCard/333").respond(204, null);
|
||||
CreditCard.remove({id:333}, callback);
|
||||
expect(callback).wasNotCalled();
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
xhr.flush();
|
||||
nakedExpect(callback.mostRecentCall.args).toEqual([{}]);
|
||||
});
|
||||
@@ -181,7 +181,7 @@ describe("resource", function() {
|
||||
nakedExpect(cc).toEqual({name:'misko'});
|
||||
xhr.flush();
|
||||
nakedExpect(cc).toEqual({id:123});
|
||||
expect(callback).wasCalledWith(cc);
|
||||
expect(callback).toHaveBeenCalledWith(cc);
|
||||
});
|
||||
|
||||
it('should not mutate the resource object if response contains no body', function(){
|
||||
|
||||
Reference in New Issue
Block a user