From 922051a6d52d8cb075b2a65620aeb8ae85c1e0c1 Mon Sep 17 00:00:00 2001 From: Santi Albo Date: Fri, 9 Aug 2013 11:50:29 +0100 Subject: [PATCH] Update documentation for angularjs $httpBackend expect methods. Both `expect`, `expectPOST`, `expectPUT` and `expectPATCH` can accept: - string - RegExp - function(string) - Object This can be seen in https://github.com/angular/angular.js/blob/master/src/ngMock/angular-mocks.js#L1504 Definition will be simpler if we just allow `data` to have type `any`. --- angularjs/angular-mocks.d.ts | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/angularjs/angular-mocks.d.ts b/angularjs/angular-mocks.d.ts index 2b02eaa63..4d8decbf8 100644 --- a/angularjs/angular-mocks.d.ts +++ b/angularjs/angular-mocks.d.ts @@ -82,14 +82,10 @@ declare module ng { verifyNoOutstandingExpectation(): void; verifyNoOutstandingRequest(): void; - expect(method: string, url: string, data?: string, headers?: any): mock.IRequestHandler; - expect(method: string, url: RegExp, data?: string, headers?: any): mock.IRequestHandler; - expect(method: string, url: string, data?: RegExp, headers?: any): mock.IRequestHandler; - expect(method: string, url: RegExp, data?: RegExp, headers?: any): mock.IRequestHandler; - expect(method: RegExp, url: string, data?: string, headers?: any): mock.IRequestHandler; - expect(method: RegExp, url: RegExp, data?: string, headers?: any): mock.IRequestHandler; - expect(method: RegExp, url: string, data?: RegExp, headers?: any): mock.IRequestHandler; - expect(method: RegExp, url: RegExp, data?: RegExp, headers?: any): mock.IRequestHandler; + expect(method: string, url: string, data?: any, headers?: any): mock.IRequestHandler; + expect(method: string, url: RegExp, data?: any, headers?: any): mock.IRequestHandler; + expect(method: RegExp, url: string, data?: any, headers?: any): mock.IRequestHandler; + expect(method: RegExp, url: RegExp, data?: any, headers?: any): mock.IRequestHandler; when(method: string, url: string, data?: string, headers?: any): mock.IRequestHandler; when(method: string, url: RegExp, data?: string, headers?: any): mock.IRequestHandler; @@ -108,18 +104,12 @@ declare module ng { expectHEAD(url: RegExp, headers?: any): mock.IRequestHandler; expectJSONP(url: string): mock.IRequestHandler; expectJSONP(url: RegExp): mock.IRequestHandler; - expectPATCH(url: string, data?: string, headers?: any): mock.IRequestHandler; - expectPATCH(url: RegExp, data?: string, headers?: any): mock.IRequestHandler; - expectPATCH(url: string, data?: RegExp, headers?: any): mock.IRequestHandler; - expectPATCH(url: RegExp, data?: RegExp, headers?: any): mock.IRequestHandler; - expectPOST(url: string, data?: string, headers?: any): mock.IRequestHandler; - expectPOST(url: RegExp, data?: string, headers?: any): mock.IRequestHandler; - expectPOST(url: string, data?: RegExp, headers?: any): mock.IRequestHandler; - expectPOST(url: RegExp, data?: RegExp, headers?: any): mock.IRequestHandler; - expectPUT(url: string, data?: string, headers?: any): mock.IRequestHandler; - expectPUT(url: RegExp, data?: string, headers?: any): mock.IRequestHandler; - expectPUT(url: string, data?: RegExp, headers?: any): mock.IRequestHandler; - expectPUT(url: RegExp, data?: RegExp, headers?: any): mock.IRequestHandler; + expectPATCH(url: string, data?: any, headers?: any): mock.IRequestHandler; + expectPATCH(url: RegExp, data?: any, headers?: any): mock.IRequestHandler; + expectPOST(url: string, data?: any, headers?: any): mock.IRequestHandler; + expectPOST(url: RegExp, data?: any, headers?: any): mock.IRequestHandler; + expectPUT(url: string, data?: any, headers?: any): mock.IRequestHandler; + expectPUT(url: RegExp, data?: any, headers?: any): mock.IRequestHandler; whenDELETE(url: string, headers?: any): mock.IRequestHandler; whenDELETE(url: RegExp, headers?: any): mock.IRequestHandler;