mirror of
https://github.com/wassname/DefinitelyTyped.git
synced 2026-09-09 11:13:57 +08:00
Merge branch 'master' into rename-repo-url
This commit is contained in:
+11
-11
@@ -15,7 +15,7 @@ declare var inject: (...fns: Function[]) => any;
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// ngMock module (angular-mocks.js)
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
declare module ng {
|
||||
declare namespace ng {
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
// AngularStatic
|
||||
@@ -28,10 +28,10 @@ declare module ng {
|
||||
interface IMockStatic {
|
||||
// see http://docs.angularjs.org/api/angular.mock.debug
|
||||
debug(obj: any): string;
|
||||
|
||||
|
||||
// see http://docs.angularjs.org/api/angular.mock.inject
|
||||
inject(...fns: Function[]): any;
|
||||
|
||||
|
||||
// see http://docs.angularjs.org/api/angular.mock.module
|
||||
module(...modules: any[]): any;
|
||||
|
||||
@@ -85,8 +85,8 @@ declare module ng {
|
||||
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;
|
||||
|
||||
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;
|
||||
when(method: string, url: string, data?: RegExp, headers?: any): mock.IRequestHandler;
|
||||
@@ -94,8 +94,8 @@ declare module ng {
|
||||
when(method: RegExp, url: string, data?: string, headers?: any): mock.IRequestHandler;
|
||||
when(method: RegExp, url: RegExp, data?: string, headers?: any): mock.IRequestHandler;
|
||||
when(method: RegExp, url: string, data?: RegExp, headers?: any): mock.IRequestHandler;
|
||||
when(method: RegExp, url: RegExp, data?: RegExp, headers?: any): mock.IRequestHandler;
|
||||
|
||||
when(method: RegExp, url: RegExp, data?: RegExp, headers?: any): mock.IRequestHandler;
|
||||
|
||||
expectDELETE(url: string, headers?: any): mock.IRequestHandler;
|
||||
expectDELETE(url: RegExp, headers?: any): mock.IRequestHandler;
|
||||
expectGET(url: string, headers?: any): mock.IRequestHandler;
|
||||
@@ -131,13 +131,13 @@ declare module ng {
|
||||
whenPUT(url: RegExp, data?: string, headers?: any): mock.IRequestHandler;
|
||||
whenPUT(url: string, data?: RegExp, headers?: any): mock.IRequestHandler;
|
||||
whenPUT(url: RegExp, data?: RegExp, headers?: any): mock.IRequestHandler;
|
||||
}
|
||||
}
|
||||
|
||||
export module mock {
|
||||
|
||||
|
||||
// returned interface by the the mocked HttpBackendService expect/when methods
|
||||
interface IRequestHandler {
|
||||
respond(func: Function): void;
|
||||
respond(func: Function): void;
|
||||
respond(status: number, data?: any, headers?: any): void;
|
||||
respond(data: any, headers?: any): void;
|
||||
|
||||
@@ -145,6 +145,6 @@ declare module ng {
|
||||
passThrough(): void;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user