need right click

Simple-Automation-Testing · Aug 3, 2019 · 345c8c2 · 345c8c2
1 parent a996981
commit 345c8c2
Show file tree

Hide file tree

Showing 6 changed files with 124 additions and 123 deletions.
diff --git a/__specs__/integration/chrome/client.spec.js b/__specs__/integration/chrome/client.spec.js
@@ -337,7 +337,7 @@ describe('client chrome', () => {
   it('tabs', async () => {
     const file = 'tabs'
     const link = $('a').waitForClickable(1000)
-    const googleInput = $('#lst-ib').waitForElementPresent(5000)
+    const googleInput = $('[name="q"]').waitForElementPresent(5000)
     await client.goTo(pathResolver(file))
     await link.click()
     await client.switchToTab(1)
@@ -347,7 +347,6 @@ describe('client chrome', () => {
   it('getRect', async () => {
     const file = 'tabs'
     const link = $('a').waitForClickable(1000)
-    const googleInput = $('#lst-ib').waitForElementPresent(5000)
     await client.goTo(pathResolver(file))
     expect(await link.getRect()).to.eql(
       {width: 76, height: 17, x: 8, y: 8}
@@ -357,7 +356,6 @@ describe('client chrome', () => {
   it('getElementHTML', async () => {
     const file = 'tabs'
     const link = $('a').waitForClickable(1000)
-    const googleInput = $('#lst-ib').waitForElementPresent(5000)
     await client.goTo(pathResolver(file))
     expect(await link.getElementHTML()).to.eql('<a href="https://www.google.com.ua" target="_blank">Go to goole</a>')
   })
@@ -402,7 +400,7 @@ describe('client chrome', () => {
     expect(await clicker.getTag()).to.eql('button')
   })
 
-  it('rightClick', async () => {
+  it.only('rightClick', async () => {
     const file = 'rightClick'
     const clicker = element('#test_button').waitForClickable(3000)
     const spans = $$('span')

diff --git a/lib/callWrapper.js b/lib/callWrapper.js
@@ -1,36 +1,36 @@
 const {handledErrors} = require('./interfaceError')
 const retryError = 'STALE_ELEMENT_REFERENCE'
 
-async function callWithWrap(action, ...rest) {
-  let driverResp = await action(this.sessionId, ...rest)
+async function callWithWrap(that, action, ...rest) {
+  let driverResp = await action(that.sessionId, ...rest)
 
   const {err, errorType} = handledErrors(driverResp.status)
 
   if(!err) return driverResp.value
 
   if(err && errorType !== retryError) {
     err({
-      sessionId: this.sessionId,
-      selector: JSON.stringify(this.selector),
+      sessionId: that.sessionId,
+      selector: JSON.stringify(that.selector),
       additionalMessage: JSON.stringify(driverResp.value),
-      parentSelector: this.baseElement && JSON.stringify(this.baseElement.selector)
+      parentSelector: that.baseElement && JSON.stringify(that.baseElement.selector)
     })
   } else {
 
-    await this.getThisElement(true)
+    await that.getThisElement(true)
 
     if(typeof rest[0] === 'string') {
-      rest[0] = this.elementId
+      rest[0] = that.elementId
     }
 
-    driverResp = await action(this.sessionId, ...rest)
+    driverResp = await action(that.sessionId, ...rest)
     const {err} = handledErrors(driverResp.status)
     if(!err) return driverResp.value
     err({
-      sessionId: this.sessionId,
-      selector: JSON.stringify(this.selector),
+      sessionId: that.sessionId,
+      selector: JSON.stringify(that.selector),
       additionalMessage: JSON.stringify(driverResp.value),
-      parentSelector: this.baseElement && JSON.stringify(this.baseElement.selector)
+      parentSelector: that.baseElement && JSON.stringify(that.baseElement.selector)
     })
   }
 }