Merge pull request DefinitelyTyped#1418 from RomanoLindano/master

Angular scenario typings.

Author: vvakame

angularjs/angular-scenario.d.ts

@@ -3,10 +3,13 @@
 // Definitions by: [RomanoLindano]
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-declare module angularScenario {
-    export interface AngularModel {
+declare module ng {
+    export interface IAngularStatic {
         scenario: any;
     }
+}
+
+declare module angularScenario {
 
     export interface RunFunction {
         (functionToRun: any): any;
@@ -46,25 +49,25 @@ declare module angularScenario {
         reload(): void;
         window(): testWindow;
         location(): testLocation;
-    }    
-    
+    }
+
     export interface Matchers {
         toEqual(value: any): void;
-        toBe(value: any): void;    
-        toBeDefined(): void;    
-        toBeTruthy(): void;            
-        toBeFalsy(): void;    
-        toMatch(regularExpression: any): void;    
-        toBeNull(): void;    
+        toBe(value: any): void;
+        toBeDefined(): void;
+        toBeTruthy(): void;
+        toBeFalsy(): void;
+        toMatch(regularExpression: any): void;
+        toBeNull(): void;
         toContain(value: any): void;
-        toBeLessThan(value: any): void;    
-        toBeGreaterThan(value: any): void;    
+        toBeLessThan(value: any): void;
+        toBeGreaterThan(value: any): void;
     }
 
-    export interface CustomMatchers extends Matchers{        
+    export interface CustomMatchers extends Matchers {
     }
 
-    export interface Expect extends CustomMatchers {        
+    export interface Expect extends CustomMatchers {
         not(): angularScenario.CustomMatchers;
     }
 
@@ -92,12 +95,12 @@ declare module angularScenario {
     export interface Select {
         option(value: any): any;
         option(...listOfValues: any[]): any;
-    }    
+    }
 
     export interface Element {
         count(): Future;
         click(): any;
-        query(callback: (selectedDOMElements: any[], callbackWhenDone: (objNull: any, futureValue: any) => any) =>any): any;
+        query(callback: (selectedDOMElements: any[], callbackWhenDone: (objNull: any, futureValue: any) => any) => any): any;
         val(): Future;
         text(): Future;
         html(): Future;
@@ -111,7 +114,7 @@ declare module angularScenario {
         scrollLeft(): Future;
         scrollTop(): Future;
         offset(): Future;
-        
+
         val(value: any): void;
         text(value: any): void;
         html(value: any): void;
@@ -154,4 +157,4 @@ declare function input(ngModelBinding: string): angularScenario.Input;
 declare function repeater(selector: string, repeaterDescription?: string): angularScenario.Repeater;
 declare function select(ngModelBinding: string): angularScenario.Select;
 declare function element(selector: string, elementDescription?: string): angularScenario.Element;
-declare var angular: angularScenario.AngularModel;
+declare var angular: ng.IAngularStatic;