respect arrow function expressions

webdriverio · Apr 30, 2021 · e22c4eb · e22c4eb
1 parent 019dd0c
commit e22c4eb
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 14 deletions.
diff --git a/protractor/index.js b/protractor/index.js
@@ -25,7 +25,8 @@ const {
     matchesSelectorExpression,
     replaceCommands,
     parseConfigProperties,
-    sanitizeAsyncCalls
+    sanitizeAsyncCalls,
+    makeAsync
 } = require('./utils')
 
 module.exports = function transformer(file, api) {
@@ -846,18 +847,8 @@ module.exports = function transformer(file, api) {
         path.parentPath.value.type !== 'AwaitExpression' &&
         [...elementGetters.keys()].map((p) => p.name).includes(path.value.property.name)
     )).replaceWith((path) => {
-        j(path).closest(j.FunctionExpression).replaceWith(({ value, parentPath }) => {
-            if (
-                parentPath.value.kind === 'get' ||
-                parentPath.value.key.name === 'constructor' ||
-                parentPath.value.key.name.startsWith('async ')
-            ) {
-                return value
-            }
-
-            parentPath.value.key.name = `async ${parentPath.value.key.name}`
-            return value
-        })
+        j(path).closest(j.FunctionExpression).replaceWith(makeAsync)
+        j(path).closest(j.BlockStatement).replaceWith(makeAsync)
         return j.awaitExpression(path.value)
     })
 

diff --git a/protractor/utils.js b/protractor/utils.js
@@ -479,12 +479,33 @@ function sanitizeAsyncCalls (j, root) {
         ))
 }
 
+function makeAsync ({ value, parentPath }) {
+    if (
+        parentPath.value.key &&
+        (
+            parentPath.value.kind === 'get' ||
+            parentPath.value.key.name === 'constructor' ||
+            parentPath.value.key.name.startsWith('async ')
+        )
+    ) {
+        return value
+    }
+
+    parentPath.value.key
+        // FunctionExpression
+        ? (value.async = true)
+        // ArrowFunctionExpression
+        : (parentPath.value.async = true)
+    return value
+}
+
 module.exports = {
     isCustomStrategy,
     TransformError,
     getSelectorArgument,
     matchesSelectorExpression,
     replaceCommands,
     parseConfigProperties,
-    sanitizeAsyncCalls
+    sanitizeAsyncCalls,
+    makeAsync
 }
diff --git a/test/__fixtures__/protractor/source/class.js b/test/__fixtures__/protractor/source/class.js
@@ -25,6 +25,9 @@ class FriendsPage extends BasePage {
         this.addnameBox.setValue(user);
         this.actualCount.setValue(pass);
         console.log(this.searchBox);
+        browser.call(() => {
+            this.actualCount.setValue(pass);
+        })
         return this.deleteButton.click();
     }
 

diff --git a/test/__fixtures__/protractor/transformed/class.js b/test/__fixtures__/protractor/transformed/class.js
@@ -48,6 +48,9 @@ class FriendsPage extends BasePage {
         (await this.addnameBox).setValue(user);
         (await this.actualCount).setValue(pass);
         console.log(await this.searchBox);
+        browser.call(async () => {
+            (await this.actualCount).setValue(pass);
+        })
         return (await this.deleteButton).click();
     }