refactpr example and fix

Simple-Automation-Testing · Jan 27, 2019 · e3cc4d8 · e3cc4d8
1 parent b1e4c6d
commit e3cc4d8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/awb.d.ts b/awb.d.ts
@@ -1,6 +1,6 @@
-import { ElementAWB as ElAWB, ElementsAWB as ElsAWB } from './lib/element'
-import { Client } from './lib/client'
-import { Config } from './lib/config'
+import {ElementAWB as ElAWB, ElementsAWB as ElsAWB} from './lib/element'
+import {Client} from './lib/client'
+import {Config} from './lib/config'
 
 interface ElementInit {
   (selector: string): ElAWB;
@@ -12,7 +12,7 @@ interface ElementsInit {
 
 export = AWB;
 
-declare function AWB(conf?: Config): { element: ElementInit, elements: ElementsInit, client: Client, $: ElementInit, $$: ElementsInit }
+declare function AWB(conf?: Config): {element: ElementInit, elements: ElementsInit, client: Client, $: ElementInit, $$: ElementsInit}
 
 declare namespace AWB {
   export type Conf = Config

diff --git a/examples/driver.js b/examples/driver.js
@@ -1,3 +1,7 @@
-const awb = require('../awb')({ browser: 'chrome', directConnection: true })
+const awb = require('../awb')({
+  desiredCapabilities: {
+    javascriptEnabled: true, acceptSslCerts: true, platform: 'ANY', browserName: 'firefox'
+  }, host: 'http://localhost:9090', remote: true
+})
 
 module.exports = awb
diff --git a/examples/po/google.po.js b/examples/po/google.po.js
@@ -3,7 +3,7 @@ const {$, $$} = require('../driver')
 class Google {
   constructor() {
     this.submitSearch = $('body').$('.tsf-p').$('[name="btnK"]').waitForClickable(1000)
-    this.inputSearch = $('#lst-ib')
+    this.inputSearch = $('[name="q"]')
     this.resultSearch = $('#ires .g').waitForElementVisible(1000)
     this.input4 = $$('input').get(4)
   }

diff --git a/lib/proxySubCalls.js b/lib/proxySubCalls.js
@@ -42,9 +42,9 @@ async function waitPresent(that, findElement, present, tagName, time) {
 async function waitClicable(that, findElement, present, displayed, tagName, time) {
   const lessTime = await waitEl(that, findElement, tagName, time)
   const {error: errorPresent, time: timePresent} = await waitCondition(present, (resp) => resp.value, lessTime, that.sessionId, that.elementId)
-  if(errorPresent) throw new InterfaceError(JSON.stringify(error))
+  if(errorPresent) throw new InterfaceError(JSON.stringify(errorPresent))
   const {error: errorDisplay, time: timeDisplayed} = await waitCondition(displayed, (resp) => resp.value, timePresent, that.sessionId, that.elementId)
-  if(errorDisplay) throw new InterfaceError(JSON.stringify(error))
+  if(errorDisplay) throw new InterfaceError(JSON.stringify(errorDisplay))
   return timeDisplayed
 }