Skip to content
This repository was archived by the owner on Jul 29, 2024. It is now read-only.

chore(expectedConditions): fixing types to functions #3281

Merged
merged 1 commit into from
Jun 20, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ gulp.task('default',['prepublish']);

gulp.task('types', function(done) {
var folder = 'built';
var files = ['ptor', 'browser', 'locators'];
var files = ['ptor', 'browser', 'locators', 'expectedConditions'];
var outputFile = path.resolve(folder, 'index.d.ts');
var contents = '';
files.forEach(file => {
Expand Down
19 changes: 10 additions & 9 deletions lib/expectedConditions.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {protractor} from './ptor';
import {ElementFinder} from './element';
let webdriver = require('selenium-webdriver');

/* globals browser */
Expand Down Expand Up @@ -167,7 +168,7 @@ export class ExpectedConditions {
* @return {!function} An expected condition that returns a promise
* representing whether the element is clickable.
*/
elementToBeClickable(elementFinder: any): Function {
elementToBeClickable(elementFinder: ElementFinder): Function {
return this.and(
this.visibilityOf(elementFinder),
elementFinder.isEnabled.bind(elementFinder));
Expand All @@ -188,7 +189,7 @@ export class ExpectedConditions {
* @return {!function} An expected condition that returns a promise
* representing whether the text is present in the element.
*/
textToBePresentInElement(elementFinder: any, text: string): Function {
textToBePresentInElement(elementFinder: ElementFinder, text: string): Function {
var hasText = () => {
return elementFinder.getText().then((actualText: string): boolean => {
return actualText.indexOf(text) > -1;
Expand All @@ -212,7 +213,7 @@ export class ExpectedConditions {
* @return {!function} An expected condition that returns a promise
* representing whether the text is present in the element's value.
*/
textToBePresentInElementValue(elementFinder: any, text: string): Function {
textToBePresentInElementValue(elementFinder: ElementFinder, text: string): Function {
var hasText = () => {
return elementFinder.getAttribute('value').then(
(actualText: string): boolean => {
Expand Down Expand Up @@ -307,7 +308,7 @@ export class ExpectedConditions {
(actualUrl: string): boolean => { return actualUrl === url; });
};
}

/**
* An expectation for checking that an element is present on the DOM
* of a page. This does not necessarily mean that the element is visible.
Expand All @@ -323,7 +324,7 @@ export class ExpectedConditions {
* @return {!function} An expected condition that returns a promise
* representing whether the element is present.
*/
presenceOf(elementFinder: any): Function {
presenceOf(elementFinder: ElementFinder): Function {
return elementFinder.isPresent.bind(elementFinder);
};

Expand All @@ -341,7 +342,7 @@ export class ExpectedConditions {
* @return {!function} An expected condition that returns a promise
* representing whether the element is stale.
*/
stalenessOf(elementFinder: any): Function {
stalenessOf(elementFinder: ElementFinder): Function {
return this.not(this.presenceOf(elementFinder));
}

Expand All @@ -361,7 +362,7 @@ export class ExpectedConditions {
* @return {!function} An expected condition that returns a promise
* representing whether the element is visible.
*/
visibilityOf(elementFinder: any): Function {
visibilityOf(elementFinder: ElementFinder): Function {
return this.and(
this.presenceOf(elementFinder),
elementFinder.isDisplayed.bind(elementFinder));
Expand All @@ -381,7 +382,7 @@ export class ExpectedConditions {
* @return {!function} An expected condition that returns a promise
* representing whether the element is invisible.
*/
invisibilityOf(elementFinder: any): Function {
invisibilityOf(elementFinder: ElementFinder): Function {
return this.not(this.visibilityOf(elementFinder));
}

Expand All @@ -398,7 +399,7 @@ export class ExpectedConditions {
* @return {!function} An expected condition that returns a promise
* representing whether the element is selected.
*/
elementToBeSelected(elementFinder: any): Function {
elementToBeSelected(elementFinder: ElementFinder): Function {
return this.and(
this.presenceOf(elementFinder),
elementFinder.isSelected.bind(elementFinder));
Expand Down