Merge pull request #539 from GuillaumeGomez/test-generated-js

Test generated JS
GuillaumeGomez · Sep 20, 2023 · 6cfd7c3 · 6cfd7c3
2 parents 0ff8477 + a3fb1ff
commit 6cfd7c3
Show file tree

Hide file tree

Showing 46 changed files with 1,178 additions and 904 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -9,9 +9,10 @@
         "module": "readonly",
         "require": "readonly"
     },
-    "parser": "babel-eslint",
+    "parser": "@babel/eslint-parser",
     "parserOptions": {
         "ecmaVersion": 2018,
+        "requireConfigFile": false,
         "sourceType": "module"
     },
     "rules": {

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -9,11 +9,11 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js 10
-        uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - name: Use Node.js 14
+        uses: actions/setup-node@v3
         with:
-          node-version: '10.x'
+          node-version: 14
       - name: Install npm dependencies
         run: npm install -r
       - name: Run linter

diff --git a/README.md b/README.md
@@ -276,6 +276,15 @@ If you want to run test suites separately:
 $ npm run api-test
 $ npm run parser-test
 $ npm run exported-test
+$ npm run generated-test
+$ npm run ui-test
+```
+
+To be noted, `ui-test` and `api-test` can be run with `--bless` to fix the differences:
+
+```bash
+$ npm run api-test -- --bless
+$ npm run ui-test -- --bless
 ```
 
 ## Donations

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
         "doc-test": "node tests/test-js/doc.js",
         "parser-test": "node tests/test-js/parser.js",
         "exported-test": "node tests/test-js/exported_items.js",
+        "generated-test": "node tests/test-js/generated.js",
         "lint": "eslint src tests/test-js",
         "lint-fix": "eslint --fix src tests/test-js"
     },
@@ -39,8 +40,9 @@
         "css-unit-converter": "^1.1.2"
     },
     "devDependencies": {
-        "babel-eslint": "^10.0.2",
-        "eslint": "^6.1.0",
+        "@babel/eslint-parser": "^7.5.4",
+        "@babel/core": "^7.11.0",
+        "eslint": "^8.49.0",
         "@iarna/toml": "2.2.5"
     }
 }
diff --git a/src/commands/assert.js b/src/commands/assert.js
@@ -839,7 +839,7 @@ function compareArrayLike(t1, t2) {
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/src/commands/input.js b/src/commands/input.js
@@ -165,7 +165,7 @@ function parseWrite(parser) {
         '("CSS selector" or "XPath", integer)';
     const elems = parser.elems;
 
-    if (elems.length !== 1) {
+    if (elems.length === 0) {
         return {'error': err + ', found nothing'};
     } else if (elems.length !== 1) {
         return {'error': err + `, found \`${parser.getRawArgs()}\``};

diff --git a/src/commands/store.js b/src/commands/store.js
@@ -187,7 +187,7 @@ const jsHandle = await ${varName}.evaluateHandle(e => {
     }
     return ret;
 });
-data = await jsHandle.jsonValue();
+const data = await jsHandle.jsonValue();
 ${code.join('\n')}`;
 
     return {
@@ -244,7 +244,7 @@ const jsHandle = await ${varName}.evaluateHandle(e => {
     }
     return ret;
 });
-data = await jsHandle.jsonValue();
+const data = await jsHandle.jsonValue();
 ${code.join('\n')}`;
 
     return {

diff --git a/src/parser.js b/src/parser.js
@@ -1083,10 +1083,6 @@ missing \`)\` at the end of the expression started line ${startLine}`;
                 this.parseJson(elems);
             } else if (c === '(') {
                 this.parseTuple(elems);
-            } else if (c === '(') {
-                // Sub-expression.
-                this.increasePos();
-                this.parseExpression([], [')'], elems);
             } else if (isLetter(c)) {
                 this.parseIdent(elems);
                 const last = elems[elems.length - 1];

diff --git a/tests/test-js/api-output/parseAssert/bool-1.toml b/tests/test-js/api-output/parseAssert/bool-1.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssert/bool-10.toml b/tests/test-js/api-output/parseAssert/bool-10.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssert/bool-2.toml b/tests/test-js/api-output/parseAssert/bool-2.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssert/bool-3.toml b/tests/test-js/api-output/parseAssert/bool-3.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssert/bool-4.toml b/tests/test-js/api-output/parseAssert/bool-4.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssert/bool-5.toml b/tests/test-js/api-output/parseAssert/bool-5.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssert/bool-6.toml b/tests/test-js/api-output/parseAssert/bool-6.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssert/bool-7.toml b/tests/test-js/api-output/parseAssert/bool-7.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssert/bool-8.toml b/tests/test-js/api-output/parseAssert/bool-8.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssert/bool-9.toml b/tests/test-js/api-output/parseAssert/bool-9.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssertFalse/bool-1.toml b/tests/test-js/api-output/parseAssertFalse/bool-1.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssertFalse/bool-10.toml b/tests/test-js/api-output/parseAssertFalse/bool-10.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssertFalse/bool-2.toml b/tests/test-js/api-output/parseAssertFalse/bool-2.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssertFalse/bool-3.toml b/tests/test-js/api-output/parseAssertFalse/bool-3.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssertFalse/bool-4.toml b/tests/test-js/api-output/parseAssertFalse/bool-4.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssertFalse/bool-5.toml b/tests/test-js/api-output/parseAssertFalse/bool-5.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssertFalse/bool-6.toml b/tests/test-js/api-output/parseAssertFalse/bool-6.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssertFalse/bool-7.toml b/tests/test-js/api-output/parseAssertFalse/bool-7.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssertFalse/bool-8.toml b/tests/test-js/api-output/parseAssertFalse/bool-8.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseAssertFalse/bool-9.toml b/tests/test-js/api-output/parseAssertFalse/bool-9.toml
@@ -3,7 +3,7 @@ instructions = [
     if (t1.length !== t2.length) {
         return false;
     }
-    for ([index, value] of t1.entries()) {
+    for (const [index, value] of t1.entries()) {
         if (value !== t2[index]) {
             return false;
         }

diff --git a/tests/test-js/api-output/parseStoreCss/basic-1.toml b/tests/test-js/api-output/parseStoreCss/basic-1.toml
@@ -19,7 +19,7 @@ const jsHandle = await parseStoreCss.evaluateHandle(e => {
     }
     return ret;
 });
-data = await jsHandle.jsonValue();
+const data = await jsHandle.jsonValue();
 arg.setVariable(\"a\", data[\"ye\"]);""",
 ]
 wait = false

diff --git a/tests/test-js/api-output/parseStoreCss/basic-2.toml b/tests/test-js/api-output/parseStoreCss/basic-2.toml
@@ -19,7 +19,7 @@ const jsHandle = await parseStoreCss.evaluateHandle(e => {
     }
     return ret;
 });
-data = await jsHandle.jsonValue();
+const data = await jsHandle.jsonValue();
 arg.setVariable(\"a\", data[\"\\\"ye\"]);""",
 ]
 wait = false

diff --git a/tests/test-js/api-output/parseStoreCss/basic-3.toml b/tests/test-js/api-output/parseStoreCss/basic-3.toml
@@ -19,7 +19,7 @@ const jsHandle = await parseStoreCss.evaluateHandle(e => {
     }
     return ret;
 });
-data = await jsHandle.jsonValue();
+const data = await jsHandle.jsonValue();
 arg.setVariable(\"a\", data[\"yaya\"]);
 arg.setVariable(\"b\", data[\"yiyi\"]);""",
 ]

diff --git a/tests/test-js/api-output/parseStoreCss/pseudo-1.toml b/tests/test-js/api-output/parseStoreCss/pseudo-1.toml
@@ -19,7 +19,7 @@ const jsHandle = await parseStoreCss.evaluateHandle(e => {
     }
     return ret;
 });
-data = await jsHandle.jsonValue();
+const data = await jsHandle.jsonValue();
 arg.setVariable(\"a\", data[\"x\"]);""",
 ]
 wait = false

diff --git a/tests/test-js/api-output/parseStoreCss/pseudo-2.toml b/tests/test-js/api-output/parseStoreCss/pseudo-2.toml
@@ -19,7 +19,7 @@ const jsHandle = await parseStoreCss.evaluateHandle(e => {
     }
     return ret;
 });
-data = await jsHandle.jsonValue();
+const data = await jsHandle.jsonValue();
 arg.setVariable(\"a\", data[\"bla\"]);""",
 ]
 wait = false

diff --git a/tests/test-js/api-output/parseStoreCss/pseudo-3.toml b/tests/test-js/api-output/parseStoreCss/pseudo-3.toml
@@ -19,7 +19,7 @@ const jsHandle = await parseStoreCss.evaluateHandle(e => {
     }
     return ret;
 });
-data = await jsHandle.jsonValue();
+const data = await jsHandle.jsonValue();
 arg.setVariable(\"a\", data[\"bip\"]);
 arg.setVariable(\"b\", data[\"bla\"]);""",
 ]

diff --git a/tests/test-js/api-output/parseStoreCss/xpath-1.toml b/tests/test-js/api-output/parseStoreCss/xpath-1.toml
@@ -20,7 +20,7 @@ const jsHandle = await parseStoreCss.evaluateHandle(e => {
     }
     return ret;
 });
-data = await jsHandle.jsonValue();
+const data = await jsHandle.jsonValue();
 arg.setVariable(\"a\", data[\"blop\"]);""",
 ]
 wait = false

diff --git a/tests/test-js/api-output/parseStoreProperty/basic-1.toml b/tests/test-js/api-output/parseStoreProperty/basic-1.toml
@@ -18,7 +18,7 @@ const jsHandle = await elem.evaluateHandle(e => {
     }
     return ret;
 });
-data = await jsHandle.jsonValue();
+const data = await jsHandle.jsonValue();
 arg.setVariable(\"a\", data[\"ye\"]);""",
 ]
 wait = false

diff --git a/tests/test-js/api-output/parseStoreProperty/basic-2.toml b/tests/test-js/api-output/parseStoreProperty/basic-2.toml
@@ -18,7 +18,7 @@ const jsHandle = await elem.evaluateHandle(e => {
     }
     return ret;
 });
-data = await jsHandle.jsonValue();
+const data = await jsHandle.jsonValue();
 arg.setVariable(\"a\", data[\"\\\"ye\"]);""",
 ]
 wait = false

diff --git a/tests/test-js/api-output/parseStoreProperty/basic-3.toml b/tests/test-js/api-output/parseStoreProperty/basic-3.toml
@@ -18,7 +18,7 @@ const jsHandle = await elem.evaluateHandle(e => {
     }
     return ret;
 });
-data = await jsHandle.jsonValue();
+const data = await jsHandle.jsonValue();
 arg.setVariable(\"a\", data[\"yaya\"]);
 arg.setVariable(\"b\", data[\"yiyi\"]);""",
 ]

diff --git a/tests/test-js/api-output/parseStoreProperty/pseudo-1.toml b/tests/test-js/api-output/parseStoreProperty/pseudo-1.toml
@@ -18,7 +18,7 @@ const jsHandle = await elem.evaluateHandle(e => {
     }
     return ret;
 });
-data = await jsHandle.jsonValue();
+const data = await jsHandle.jsonValue();
 arg.setVariable(\"a\", data[\"x\"]);""",
 ]
 wait = false

diff --git a/tests/test-js/api-output/parseStoreProperty/pseudo-2.toml b/tests/test-js/api-output/parseStoreProperty/pseudo-2.toml
@@ -18,7 +18,7 @@ const jsHandle = await elem.evaluateHandle(e => {
     }
     return ret;
 });
-data = await jsHandle.jsonValue();
+const data = await jsHandle.jsonValue();
 arg.setVariable(\"a\", data[\"bla\"]);""",
 ]
 wait = false