Clearer promise logic for getting ad properties

Automattic · Jul 18, 2017 · bd4beca · bd4beca
1 parent 1e70218
commit bd4beca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 34 deletions.
diff --git a/lib/pages/external/google-ad-preview-tool.js b/lib/pages/external/google-ad-preview-tool.js
@@ -10,9 +10,7 @@ export default class GoogleAdPreviewTool extends BaseContainer {
 		if ( location ) {
 			this.setLocation( location );
 		}
-		if ( 'en' !== language  ) {
-			this.setLanguage( language );
-		}
+		this.setLanguage( language );
 		this.checkURL();
 	}
 	setLocation( location ) {
@@ -40,6 +38,7 @@ export default class GoogleAdPreviewTool extends BaseContainer {
 		var languageMapping = {
 			'ar': 'Arabic',
 			'de': 'German',
+			'en': 'English',
 			'es': 'Spanish',
 			'fr': 'French',
 			'he': 'Hebrew',

diff --git a/lib/pages/external/google-search.js b/lib/pages/external/google-search.js
@@ -16,50 +16,24 @@ export default class GoogleSearchPage extends BaseContainer {
 	}
 
 	getAdUrl() {
-		var d = webdriver.promise.defer();
-
-		this.adLink.getAttribute( 'href' ).then( ( href ) => {
-			d.fulfill( href );
-		} );
-
-		return d.promise;
+		return this.adLink.getAttribute( 'href' );
 	}
 
 	getAdHeadline() {
-		var d = webdriver.promise.defer();
-
-		this.adLink.getText().then( ( text ) => {
-			d.fulfill( text );
-		} );
-
-		return d.promise;
+		return this.adLink.getText();
 	}
 
 	getAdText() {
-		var d = webdriver.promise.defer();
-
-		var element = this.adLink.findElement( by.xpath( '../../div[@class="ads-visurl"]/cite' ) );
-
-		element.getText().then( ( text ) => {
-			d.fulfill( text );
-		} );
-
-		return d.promise;
+		return this.adLink.findElement( by.xpath( '../../div[@class="ads-visurl"]/cite' ) ).getText();
 	}
 
 	getAdVisibleUrl() {
-		var d = webdriver.promise.defer();
-		var element = this.adLink.findElement( by.xpath( '../../div[contains(@class,"ads-creative")]' ) );
-
-		element.getText().then( ( text ) => {
-			d.fulfill( text );
-		} );
-
-		return d.promise;
+		return this.adLink.findElement( by.xpath( '../../div[contains(@class,"ads-creative")]' ) ).getText();
 	}
 
 	getAdPosition() {
 		var d = webdriver.promise.defer();
+
 		this.driver.findElements( by.xpath( '//li[@class="ads-ad"]' ) ).then( ( elements ) => {
 			for ( var i = 0, l = elements.length; i < l; i++ ) {
 				elements[i].findElement( by.xpath( './/a[contains(@href, "' + this.referenceUrl + '")]' ) ).then( ( function( i ) {