From 43130d44a5e7007f838702ae9340aec3aea0afd1 Mon Sep 17 00:00:00 2001 From: Dick van den Brink Date: Sat, 12 Apr 2014 19:23:51 +0200 Subject: [PATCH 1/3] Add missing test functions --- casperjs/casperjs.d.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/casperjs/casperjs.d.ts b/casperjs/casperjs.d.ts index 0445f443f..a91f84c8c 100644 --- a/casperjs/casperjs.d.ts +++ b/casperjs/casperjs.d.ts @@ -200,6 +200,9 @@ interface Tester { assertExists(selector: string, message?: string): any; assertFalsy(subject: any, message?: string): any; assertField(inputName: string, expected: string, message?: string): any; + assertFieldName(inputName: string, expected: string, message?: string, options?: any): any; + assertFieldCSS(cssSelector: string, expected: string, message?: string): any; + assertFieldXPath(xpathSelector: string, expected: string, message?: string): any; assertHttpStatus(status: number, message?: string): any; assertMatch(subject: any, pattern: RegExp, message?: string): any; assertNot(subject: any, message?: string): any; @@ -216,6 +219,7 @@ interface Tester { assertTitleMatch(pattern: RegExp, message?: string): any; assertTruthy(subject: any, message?: string): any; assertType(input: any, type: string, message?: string): any; + assertInstanceOf(input: any, ctor: Function, message?: string): any; assertUrlMatch(pattern: string, message?: string): any; assertUrlMatch(pattern: RegExp, message?: string): any; assertVisible(selector: string, message?: string): any; @@ -237,6 +241,10 @@ interface Tester { info(message: string): any; pass(message: string): any; renderResults(exit: boolean, status: number, save: string): any; + + setup(fn: Function); + skip(nb: number, message: string); + tearDown(fn: Function); } interface Cases { From 62e032b12d0bcbca2bc90fb79cce4eb2389efea0 Mon Sep 17 00:00:00 2001 From: Dick van den Brink Date: Sat, 12 Apr 2014 19:48:31 +0200 Subject: [PATCH 2/3] Add some more missing functions --- casperjs/casperjs.d.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/casperjs/casperjs.d.ts b/casperjs/casperjs.d.ts index a91f84c8c..af31bb981 100644 --- a/casperjs/casperjs.d.ts +++ b/casperjs/casperjs.d.ts @@ -20,12 +20,14 @@ interface Casper extends EventEmitter { constructor (options: CasperOptions): Casper; + options: CasperOptions; // Properties __utils__: ClientUtils; // Methods back(): Casper; base64encode(url: string, method?: string, data?: any): string; + bypass(nb: number) click(selector: string): boolean; clickLabel(label: string, tag?: string): boolean; capture(targetFilePath: string, clipRect: ClipRect): Casper; @@ -49,11 +51,15 @@ interface Casper extends EventEmitter { forward(): Casper; log(message: string, level?: string, space?: string): Casper; fill(selector: string, values: any, submit?: boolean): void; + fillSelectors(selector: string, values: any, submit?: boolean): void; + fillXPath(selector: string, values: any, submit?: boolean): void; getCurrentUrl(): string; getElementAttribute(selector: string, attribute: string): string; + getElementsAttribute(selector: string, attribute: string): string; getElementBounds(selector: string): ElementBounds; getElementsBounds(selector: string): ElementBounds[]; getElementInfo(selector: string): ElementInfo; + getElementsInfo(selector: string): ElementInfo; getFormValues(selector: string): any; getGlobal(name: string): any; getHTML(selector?: string, outer?: boolean): string; @@ -66,24 +72,33 @@ interface Casper extends EventEmitter { resourceExists(test: Function): boolean; resourceExists(test: string): boolean; run(onComplete: Function, time?: number): Casper; + scrollTo(x: number, y, number): Casper; + scrollToBottom(): Casper; sendKeys(selector: string, keys: string, options?: any): Casper; setHttpAuth(username: string, password: string): Casper; start(url?: string, then?: (response: HttpResponse) => void): Casper; status(asString: boolean): any; then(fn: (self?: Casper) => void): Casper; + thenBypass(nb: number): Casper; + thenBypassIf(condition: any, nb: number): Casper; + thenBypassUnless(condition: any, nb: number): Casper; thenClick(selector: string): Casper; thenEvaluate(fn: () => any, ...args: any[]): Casper; thenOpen(location: string, then?: (response: HttpResponse) => void): Casper; thenOpen(location: string, options?: OpenSettings, then?: (response: HttpResponse) => void): Casper; thenOpenAndEvaluate(location: string, then?: Function, ...args: any[]): Casper; toString(): string; + unwait(): Casper; userAgent(agent: string): string; viewport(width: number, height: number): Casper; visible(selector: string): boolean; wait(timeout: number, then?: Function): Casper; waitFor(testFx: Function, then?: Function, onTimeout?: Function, timeout?: number): Casper; + waitForAlert(then: Function, onTimeout?: Function, timeout?: number): Casper; waitForPopup(urlPattern: string, then?: Function, onTimeout?: Function, timeout?: number): Casper; waitForPopup(urlPattern: RegExp, then?: Function, onTimeout?: Function, timeout?: number): Casper; + waitForUrl(url: string, then?: Function, onTimeout?: Function, timeout?: number): Casper; + waitForUrl(url: RegExp, then?: Function, onTimeout?: Function, timeout?: number): Casper; waitForSelector(selector: string, then?: Function, onTimeout?: Function, timeout?: number): Casper; waitWhileSelector(selector: string, then?: Function, onTimeout?: Function, timeout?: number): Casper; waitForResource(testFx: Function, then?: Function, onTimeout?: Function, timeout?: number): Casper; @@ -157,10 +172,12 @@ interface CasperOptions { pageSettings?: any; remoteScripts?: any[]; safeLogs?: boolean; + silentErrors?: boolean; stepTimeout?: number; timeout?: number; verbose?: boolean; viewportSize?: any; + retryTimeout?: number; waitTimeout?: number; } From b690ed7cec142d5c1dcbb78a34e2b6c71090c7f2 Mon Sep 17 00:00:00 2001 From: Dick van den Brink Date: Sun, 13 Apr 2014 16:31:17 +0200 Subject: [PATCH 3/3] Fixed errors with noImplicitAny --- casperjs/casperjs.d.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/casperjs/casperjs.d.ts b/casperjs/casperjs.d.ts index af31bb981..ad942293b 100644 --- a/casperjs/casperjs.d.ts +++ b/casperjs/casperjs.d.ts @@ -27,7 +27,7 @@ interface Casper extends EventEmitter { // Methods back(): Casper; base64encode(url: string, method?: string, data?: any): string; - bypass(nb: number) + bypass(nb: number): any; click(selector: string): boolean; clickLabel(label: string, tag?: string): boolean; capture(targetFilePath: string, clipRect: ClipRect): Casper; @@ -72,7 +72,7 @@ interface Casper extends EventEmitter { resourceExists(test: Function): boolean; resourceExists(test: string): boolean; run(onComplete: Function, time?: number): Casper; - scrollTo(x: number, y, number): Casper; + scrollTo(x: number, y: number): Casper; scrollToBottom(): Casper; sendKeys(selector: string, keys: string, options?: any): Casper; setHttpAuth(username: string, password: string): Casper; @@ -259,9 +259,9 @@ interface Tester { pass(message: string): any; renderResults(exit: boolean, status: number, save: string): any; - setup(fn: Function); - skip(nb: number, message: string); - tearDown(fn: Function); + setup(fn: Function): any; + skip(nb: number, message: string): any; + tearDown(fn: Function): any; } interface Cases {