wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-09 11:13:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3353 from derekcicerone/patch-1

Browse Source 
Fix types for promises in selenium-webdriver
This commit is contained in:
Masahiro Wakame
2014-12-23 11:21:34 +09:00
parent 48b4cb54af bb811116eb
commit 95b4a1a3c4
2 changed files with 88 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selenium-webdriver/selenium-webdriver-tests.ts
+6 -8
View File
@@ -777,7 +777,7 @@ function TestWebElementPromise() {
elementPromise.then();
elementPromise.then(function (element: webdriver.WebElement) { });
elementPromise.then(function (element: webdriver.WebElement) { }, function (error: any) { });
elementPromise.then<string>(function (element: webdriver.WebElement) { }, function (error: any) { }).then(function (result: string) { });
elementPromise.then(function (element: webdriver.WebElement) { return "foo"; }, function (error: any) { }).then(function (result: string) { });
elementPromise.thenCatch(function (error: any) { }).then(function (value: any) { });
@@ -1029,10 +1029,9 @@ function TestPromiseClass() {
var isPending: boolean = promise.isPending();
promise = promise.then();
promise = promise.then(function( a: string ) { });
promise = promise.then(function( a: string ) { return 'cde'; });
promise = promise.then(function( a: string ) {}, function( e: any) {});
promise = promise.then(function (a: string) { }, function (e: any) { return 123; });
promise = promise.then(function( a: string ) { return 'cde'; }, function( e: any) {});
promise = promise.then(function( a: string ) { return 'cde'; }, function (e: any) { return 123; });
promise = promise.thenCatch(function (error: any) { });
@@ -1047,10 +1046,9 @@ function TestThenableClass() {
var isPending: boolean = thenable.isPending();
thenable = thenable.then();
thenable = thenable.then(function (a: string) { });
thenable = thenable.then(function (a: string) { return 'cde'; });
thenable = thenable.then(function (a: string) { }, function (e: any) { });
thenable = thenable.then(function (a: string) { }, function (e: any) { return 123; });
thenable = thenable.then(function (a: string) { return 'cde'; }, function (e: any) { });
thenable = thenable.then(function (a: string) { return 'cde'; }, function (e: any) { return 123; });
thenable = thenable.thenCatch(function (error: any) { });
@@ -1158,4 +1156,4 @@ function TestTestingModule() {
testing.afterEach(function () {
});
}
}
selenium-webdriver/selenium-webdriver.d.ts
Vendored
+82 -28
View File
@@ -505,10 +505,10 @@ declare module firefox {
}
declare module executors {
/**
* Creates a command executor that uses WebDriver's JSON wire protocol.
* @param url The server's URL, or a promise that will resolve to that URL.
* @returns {!webdriver.CommandExecutor} The new command executor.
/**
* Creates a command executor that uses WebDriver's JSON wire protocol.
* @param url The server's URL, or a promise that will resolve to that URL.
* @returns {!webdriver.CommandExecutor} The new command executor.
*/
function createExecutor(url: string): webdriver.CommandExecutor;
function createExecutor(url: webdriver.promise.Promise<string>): webdriver.CommandExecutor;
@@ -1055,17 +1055,30 @@ declare module webdriver {
/**
* Registers listeners for when this instance is resolved.
*
* @param {?(function(T): (R|webdriver.promise.Promise.<R>))=} opt_callback The
* @param opt_callback The
* function to call if this promise is successfully resolved. The function
* should expect a single argument: the promise's resolved value.
* @param {?(function(*): (R|webdriver.promise.Promise.<R>))=} opt_errback The
* @param opt_errback The
* function to call if this promise is rejected. The function should expect
* a single argument: the rejection reason.
* @return {!webdriver.promise.Promise.<R>} A new promise which will be
* @return A new promise which will be
* resolved with the result of the invoked callback.
* @template R
*/
then<R>(opt_callback?: (value: T) => any, opt_errback?: (error: any) => any): Promise<R>;
then<R>(opt_callback?: (value: T) => Promise<R>, opt_errback?: (error: any) => any): Promise<R>;
/**
* Registers listeners for when this instance is resolved.
*
* @param opt_callback The
* function to call if this promise is successfully resolved. The function
* should expect a single argument: the promise's resolved value.
* @param opt_errback The
* function to call if this promise is rejected. The function should expect
* a single argument: the rejection reason.
* @return A new promise which will be
* resolved with the result of the invoked callback.
*/
then<R>(opt_callback?: (value: T) => R, opt_errback?: (error: any) => any): Promise<R>;
/**
@@ -1161,17 +1174,30 @@ declare module webdriver {
/**
* Registers listeners for when this instance is resolved.
*
* @param {?(function(T): (R|webdriver.promise.Promise.<R>))=} opt_callback The
* @param opt_callback The
* function to call if this promise is successfully resolved. The function
* should expect a single argument: the promise's resolved value.
* @param {?(function(*): (R|webdriver.promise.Promise.<R>))=} opt_errback The
* @param opt_errback The
* function to call if this promise is rejected. The function should expect
* a single argument: the rejection reason.
* @return {!webdriver.promise.Promise.<R>} A new promise which will be
* @return A new promise which will be
* resolved with the result of the invoked callback.
* @template R
*/
then<R>(opt_callback?: (value: T) => any, opt_errback?: (error: any) => any): Promise<R>;
then<R>(opt_callback?: (value: T) => Promise<R>, opt_errback?: (error: any) => any): Promise<R>;
/**
* Registers listeners for when this instance is resolved.
*
* @param opt_callback The
* function to call if this promise is successfully resolved. The function
* should expect a single argument: the promise's resolved value.
* @param opt_errback The
* function to call if this promise is rejected. The function should expect
* a single argument: the rejection reason.
* @return A new promise which will be
* resolved with the result of the invoked callback.
*/
then<R>(opt_callback?: (value: T) => R, opt_errback?: (error: any) => any): Promise<R>;
/**
@@ -1304,16 +1330,31 @@ declare module webdriver {
* Registers listeners for when this instance is resolved. This function most
* overridden by subtypes.
*
* @param {Function=} opt_callback The function to call if this promise is
* @param opt_callback The function to call if this promise is
* successfully resolved. The function should expect a single argument: the
* promise's resolved value.
* @param {Function=} opt_errback The function to call if this promise is
* @param opt_errback The function to call if this promise is
* rejected. The function should expect a single argument: the rejection
* reason.
* @return {!webdriver.promise.Promise} A new promise which will be resolved
* @return A new promise which will be resolved
* with the result of the invoked callback.
*/
then<R>(opt_callback?: (value: T) => any, opt_errback?: (error: any) => any): Promise<R>;
then<R>(opt_callback?: (value: T) => Promise<R>, opt_errback?: (error: any) => any): Promise<R>;
/**
* Registers listeners for when this instance is resolved. This function most
* overridden by subtypes.
*
* @param opt_callback The function to call if this promise is
* successfully resolved. The function should expect a single argument: the
* promise's resolved value.
* @param opt_errback The function to call if this promise is
* rejected. The function should expect a single argument: the rejection
* reason.
* @return A new promise which will be resolved
* with the result of the invoked callback.
*/
then<R>(opt_callback?: (value: T) => R, opt_errback?: (error: any) => any): Promise<R>;
/**
@@ -1762,7 +1803,7 @@ declare module webdriver {
module until {
/**
* Defines a condition to
* Defines a condition to
*/
class Condition<T> {
/**
@@ -3536,7 +3577,7 @@ declare module webdriver {
* capabilities for the new session.
* @param {webdriver.promise.ControlFlow=} opt_flow The control flow all driver
* commands should execute under, including the initial session creation.
* Defaults to the {@link webdriver.promise.controlFlow() currently active}
* Defaults to the {@link webdriver.promise.controlFlow() currently active}
* control flow.
* @return {!webdriver.WebDriver} The driver for the newly created session.
*/
@@ -4554,17 +4595,30 @@ declare module webdriver {
/**
* Registers listeners for when this instance is resolved.
*
* @param {?(function(T): (R|webdriver.promise.Promise.<R>))=} opt_callback The
* @param opt_callback The
* function to call if this promise is successfully resolved. The function
* should expect a single argument: the promise's resolved value.
* @param {?(function(*): (R|webdriver.promise.Promise.<R>))=} opt_errback The
* @param opt_errback The
* function to call if this promise is rejected. The function should expect
* a single argument: the rejection reason.
* @return {!webdriver.promise.Promise.<R>} A new promise which will be
* @return A new promise which will be
* resolved with the result of the invoked callback.
* @template R
*/
then<R>(opt_callback?: (value: WebElement) => any, opt_errback?: (error: any) => any): webdriver.promise.Promise<R>;
then<R>(opt_callback?: (value: WebElement) => webdriver.promise.Promise<R>, opt_errback?: (error: any) => any): webdriver.promise.Promise<R>;
/**
* Registers listeners for when this instance is resolved.
*
* @param opt_callback The
* function to call if this promise is successfully resolved. The function
* should expect a single argument: the promise's resolved value.
* @param opt_errback The
* function to call if this promise is rejected. The function should expect
* a single argument: the rejection reason.
* @return A new promise which will be
* resolved with the result of the invoked callback.
*/
then<R>(opt_callback?: (value: WebElement) => R, opt_errback?: (error: any) => any): webdriver.promise.Promise<R>;
/**
@@ -4795,11 +4849,11 @@ declare module 'selenium-webdriver/chrome' {
declare module 'selenium-webdriver/firefox' {
export = firefox;
}
}
declare module 'selenium-webdriver/executors' {
export = executors;
}
}
declare module 'selenium-webdriver' {
export = webdriver;
@@ -4807,4 +4861,4 @@ declare module 'selenium-webdriver' {
declare module 'selenium-webdriver/testing' {
export = testing;
}
}