Fixed merge conflict

jessep · Aug 24, 2014 · f3423ae · f3423ae
2 parents 05ba8a6 + a174e90
commit f3423ae
Show file tree

Hide file tree

Showing 218 changed files with 21,676 additions and 5,803 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - 0.10
+  - "0.10"
 
 notifications:
   email: false
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
diff --git a/angular-agility/angular-agility.d.ts b/angular-agility/angular-agility.d.ts
@@ -41,7 +41,7 @@ declare module aa {
 		[settingName: string]: any;
 	}
 
-	export interface IFormExtensionsProvider extends ng.auto.IProvider {
+	export interface IFormExtensionsProvider extends ng.IServiceProvider {
 		defaultLabelStrategy:string;
 		defaultFieldGroupStrategy:string;
 		defaultValMsgPlacementStrategy:string;
@@ -88,7 +88,7 @@ declare module aa {
 		message:string;
 	}
 
-	export interface INotifyConfigProvider extends ng.auto.IProvider {
+	export interface INotifyConfigProvider extends ng.IServiceProvider {
 		notifyConfigs:any;
 		defaultTargetContainerName:string;
 		defaultNotifyConfig:string;

diff --git a/angular-bootstrap-lightbox/angular-bootstrap-lightbox-tests.ts b/angular-bootstrap-lightbox/angular-bootstrap-lightbox-tests.ts
@@ -0,0 +1,35 @@
+///<reference path='angular-bootstrap-lightbox.d.ts'/>
+
+var imageList:angular.bootstrap.lightbox.ILightboxImageInfo[] = [];
+imageList.push({
+	url: 'url1',
+	width: 100,
+        height: 100
+});
+imageList.push({
+	url: 'url2',
+	width: 100,
+        height: 100,
+        thumbUrl: 'thumbUrl',
+        caption: 'caption'
+});
+
+var lightBox:angular.bootstrap.lightbox.ILightbox = <any> {};
+lightBox.openModal(imageList, 0);
+
+var provider:angular.bootstrap.lightbox.ILightBoxProvider = <any> {};
+provider.templateUrl = 'templateUrl';
+provider.calculateImageDimensionLimits = (dimensions:angular.bootstrap.lightbox.IImageDimensionParameter):angular.bootstrap.lightbox.IImageDimensionLimits=> {
+	return {
+		minWidth: 100,
+		minHeight: 100,
+		maxWidth: dimensions.windowWidth - 102,
+		maxHeight: dimensions.windowHeight - 136
+	};
+};
+provider.calculateModalDimensions = (dimensions:angular.bootstrap.lightbox.IModalDimensionsParameter):angular.bootstrap.lightbox.IModalDimensions=> {
+    return {
+      width: Math.max(500, dimensions.imageDisplayWidth + 42),
+     height: Math.max(500, dimensions.imageDisplayHeight + 76)
+    };
+  };
diff --git a/angular-bootstrap-lightbox/angular-bootstrap-lightbox.d.ts b/angular-bootstrap-lightbox/angular-bootstrap-lightbox.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for angular-bootstrap-lightbox
+// Project: https://github.com/compact/angular-bootstrap-lightbox
+// Definitions by: Roland Zwaga <https://github.com/rolandzwaga>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module angular.bootstrap.lightbox {
+
+    export interface ILightboxImageInfo {
+        url: string;
+        width: number;
+        height: number;
+        thumbUrl?: string;
+        caption?: string;
+    }
+
+    export interface IImageDimensionLimits  {
+        minWidth?: number;
+        minHeight?: number;
+        maxWidth?: number;
+        maxHeight?: number;
+    }
+
+    export interface IImageDimensionParameter {
+        windowWidth:number;
+        windowHeight:number;
+        imageWidth:number;
+        imageHeight:number;
+    }
+
+    export interface IModalDimensionsParameter {
+        windowWidth:number;
+        windowHeight:number;
+        imageDisplayWidth:number;
+        imageDisplayHeight:number;
+    }
+
+    export interface IModalDimensions {
+        width:number;
+        height:number;
+    }
+
+    export interface ILightbox {
+        openModal(images:ILightboxImageInfo[], index:number):void;
+    }
+
+    export interface ILightBoxProvider {
+        templateUrl:string;
+        calculateImageDimensionLimits:(dimensions:IImageDimensionParameter)=>IImageDimensionLimits;
+        calculateModalDimensions:(dimensions:IModalDimensionsParameter)=>IModalDimensions;
+    }
+}
diff --git a/angular-hotkeys/angular-hotkeys-tests.ts b/angular-hotkeys/angular-hotkeys-tests.ts
@@ -0,0 +1,25 @@
+/// <reference path="../angularjs/angular.d.ts" />
+/// <reference path="angular-hotkeys.d.ts" />
+
+var scope: ng.IScope;
+var hotkeyProvider: ng.hotkeys.HotkeysProvider;
+var hotkeyObj: ng.hotkeys.Hotkey;
+
+hotkeyProvider.add("mod+s", "saves a file", (event: Event, hotkey: ng.hotkeys.Hotkey) => {} );
+hotkeyProvider.add(hotkeyObj);
+hotkeyProvider.bindTo(scope);
+hotkeyProvider.del("mod+s");
+hotkeyProvider.get("mod+s");
+hotkeyProvider.toggleCheatSheet();
+
+hotkeyProvider.add(hotkeyObj.combo, hotkeyObj.description ,hotkeyObj.callback);
+
+hotkeyProvider.bindTo(scope)
+	.add(hotkeyObj)
+	.add(hotkeyObj)
+	.add({
+		combo: 'w',
+		description: 'blah blah',
+		callback: function() {}
+	});
+
diff --git a/angular-hotkeys/angular-hotkeys.d.ts b/angular-hotkeys/angular-hotkeys.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for angular-hotkeys
+// Project: https://github.com/chieffancypants/angular-hotkeys
+// Definitions by: Jason Zhao <https://github.com/jlz27>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../angularjs/angular.d.ts" />
+
+declare module ng.hotkeys {
+
+    interface HotkeysProvider {
+        template: string;
+        includeCheatSheet: boolean;
+        cheatSheetHotkey: string;
+        cheatSheetDescription: string;
+
+        add(combo: string, description: string, callback: (event: Event, hotkeys: ng.hotkeys.Hotkey) => void): void;
+
+        add(hotkeyObj: ng.hotkeys.Hotkey): void;
+
+        bindTo(scope : ng.IScope): ng.hotkeys.HotkeysProviderChained;
+
+        del(combo: string): void;
+
+        get(combo: string): ng.hotkeys.Hotkey;
+
+        toggleCheatSheet(): void;
+    }
+
+    interface HotkeysProviderChained {
+        add(combo: string, description: string, callback: (event: Event, hotkeys: ng.hotkeys.Hotkey) => void): HotkeysProviderChained;
+
+        add(hotkeyObj: ng.hotkeys.Hotkey): HotkeysProviderChained;
+    }
+
+    interface Hotkey {
+        combo: string;
+        description?: string;
+        callback: (event: Event, hotkey: ng.hotkeys.Hotkey) => void;
+    }
+}
diff --git a/angular-protractor/angular-protractor-tests.ts b/angular-protractor/angular-protractor-tests.ts
@@ -153,21 +153,36 @@ function TestProtractor() {
 
     ptor.debugger();
 
+    var webElement: protractor.WebElement = ptor.findElement(by.css('.class'));
+    var promise: webdriver.promise.Promise;
+    promise = ptor.findElements(by.css('.class'));
+    promise = ptor.isElementPresent(by.css('.class'));
+    promise = ptor.isElementPresent(webElement);
+
     ptor.clearMockModules();
     ptor.addMockModule('name', 'script');
     ptor.addMockModule('name', function() {});
+    ptor.removeMockModule('name');
     ptor.waitForAngular();
 
     var elementFinder: protractor.ElementFinder;
+    var elementArrayFinder: protractor.ElementArrayFinder;
 
     elementFinder = ptor.element(by.id('ABC'));
     elementFinder = ptor.$('.class');
 
-    var elementArrayFinder: protractor.ElementArrayFinder = ptor.$$('.class');
-
-    var webElement: webdriver.WebElement = ptor.wrapWebElement(new webdriver.WebElement(driver, 'id'));
+    elementArrayFinder = ptor.$$('.class');
 
     var locationAbsUrl: webdriver.promise.Promise = ptor.getLocationAbsUrl();
+    ptor.setLocation('webaddress.com');
+
+    promise = ptor.get('webaddress.com');
+    promise = ptor.get('webdaddress.com', 45);
+    ptor.refresh();
+    ptor.refresh(45);
+    var navigation: webdriver.WebDriverNavigation = ptor.navigate();
+    ptor.pause();
+    ptor.pause(8080);
 }
 
 function TestElement() {
@@ -180,6 +195,7 @@ function TestElementFinder() {
     var promise: webdriver.promise.Promise;
 
     promise = elementFinder.click();
+    promise = elementFinder.allowAnimations('string');
     promise = elementFinder.sendKeys(protractor.Key.UP, protractor.Key.DOWN);
     promise = elementFinder.getTagName();
     promise = elementFinder.getCssValue('display');
@@ -195,19 +211,49 @@ function TestElementFinder() {
     promise = elementFinder.getOuterHtml();
     promise = elementFinder.getInnerHtml();
     promise = elementFinder.isElementPresent(by.id('id'));
-    promise = elementFinder.isElementPresent(by.js('function(a, b, c) {}'), 1, 2, 3);
-    promise = elementFinder.findElements(by.className('class'));
-    promise = elementFinder.findElements(by.js('function(a, b, c) {}'), 1, 2, 3);
+    promise = elementFinder.$('.class');
     promise = elementFinder.$$('.class');
     promise = elementFinder.evaluate('expression');
     promise = elementFinder.isPresent();
 
     var webElement: webdriver.WebElement;
+}
+
+function TestElementArrayFinder() {
+    var elementArrayFinder: protractor.ElementArrayFinder = element.all(by.id('id'));
+    var promise: webdriver.promise.Promise;
+    var elementFinder: protractor.ElementFinder;
 
-    webElement = elementFinder.$('.class');
-    webElement = elementFinder.findElement(by.id('id'));
-    webElement = elementFinder.findElement(by.js('function(a, b, c) {}'), 1, 2, 3);
-    webElement = elementFinder.find();
+    var driverElementArray: webdriver.WebElement[] = elementArrayFinder.getWebElements();
+    elementFinder = elementArrayFinder.get(42);
+    elementFinder = elementArrayFinder.first();
+    elementFinder = elementArrayFinder.last();
+    promise = elementArrayFinder.count();
+    promise = elementArrayFinder.asElementFinders_();
+    elementArrayFinder.each(function(element: protractor.ElementFinder){
+        // nothing
+    });
+    elementArrayFinder.map(function(element: protractor.ElementFinder, index: number){
+        // nothing
+    });
+    elementArrayFinder.filter(function(element: protractor.ElementFinder, index: number){
+        return element.getText().then((text: string) => {
+            return text === "foo";
+        });
+    });
+    elementArrayFinder.reduce(function(accumulator: string, element: protractor.ElementFinder){
+        return element.getText().then((text: string) => {
+            return accumulator + ',' + text;
+        });
+    }, '');
+    elementArrayFinder.reduce(function(accumulator: string, element: protractor.ElementFinder, index: number, array: protractor.ElementFinder[]){
+        return element.getText().then((text: string) => {
+            return accumulator + ',' + text;
+        });
+    }, '');
+    elementArrayFinder.then(function(underlyingElementFinders: protractor.ElementFinder[]){
+        //nothing
+    });
 }
 
 // This function tests the angular specific locator strategies.
@@ -216,29 +262,19 @@ function TestLocatorStrategies() {
     var webElement: webdriver.WebElement;
 
     // Protractor Specific Locators
+    protractor.By.addLocator('customLocator', 'script');
+    protractor.By.addLocator('customLocator2', function(){
+        // nothing
+    });
     webElement = ptor.findElement(protractor.By.binding('binding'));
-    webElement = ptor.findElement(protractor.By.select('select'));
-    webElement = ptor.findElement(protractor.By.selectedOption('selectedOptions'));
-    webElement = ptor.findElement(protractor.By.input('input'));
+    webElement = ptor.findElement(protractor.By.exactBinding('exactBinding'));
     webElement = ptor.findElement(protractor.By.model('model'));
-    webElement = ptor.findElement(protractor.By.textarea('textarea'));
     webElement = ptor.findElement(protractor.By.repeater('repeater'));
+    webElement = ptor.findElement(protractor.By.repeater('repeater').column(0));
+    webElement = ptor.findElement(protractor.By.repeater('repeater').row(0));
+    webElement = ptor.findElement(protractor.By.repeater('repeater').row(0).column(0));
     webElement = ptor.findElement(protractor.By.buttonText('buttonText'));
     webElement = ptor.findElement(protractor.By.partialButtonText('partialButtonText'));
-}
-
-// This function tests the methods that were added to the base WebElement class
-function TestWebElements() {
-    var ptor: protractor.Protractor = protractor.getInstance();
-
-    var webElement: protractor.WebElement;
-    var promise: webdriver.promise.Promise;
-
-    webElement = ptor.findElement(by.id('id')).$('.class');
-    promise = ptor.findElement(by.id('id')).$$('.class');
-    promise = ptor.findElement(by.id('id')).evaluate('something');
-
-    webElement = webElement.findElement(by.id('id')).$('.class');
-    promise = webElement.findElement(by.id('id')).$$('.class');
-    promise = webElement.findElement(by.id('id')).evaluate('something');
+    webElement = ptor.findElement(protractor.By.cssContainingText('cssSelector', 'search text'));
+    webElement = ptor.findElement(protractor.By.options('options'));
 }