Correctly handle numbers in set-property and set-attribute commands

Author: GuillaumeGomez

src/commands/dom_modifiers.js

@@ -94,8 +94,11 @@ ${indentString(code.join('\n'), 1)}
 function parseSetAttribute(parser) {
     return innerParseCssAttribute(parser, 'attribute', 'parseSetAttributeElem', true,
         (key, value, kind) => {
-            if (kind !== 'ident' && kind !== 'boolean') {
-                return `e.setAttribute("${key}","${value.value}");`;
+            if (kind !== 'ident') {
+                if (kind !== 'boolean' && kind !== 'number') {
+                    return `e.setAttribute("${key}","${value.value}");`;
+                }
+                return `e.setAttribute("${key}",${value.value});`;
             }
             return `e.removeAttribute("${key}");`;
         }, false);
@@ -111,7 +114,7 @@ function parseSetProperty(parser) {
             const k_s = value.key.kind === 'object-path' ? key : `["${key}"]`;
             const arg = kind === 'ident' ? 'undefined' :
                 // eslint-disable-next-line no-extra-parens
-                (kind === 'boolean' ? `${value.value}` : `"${value.value}"`);
+                (kind === 'boolean' || kind === 'number' ? `${value.value}` : `"${value.value}"`);
             return `setObjValue(e, ${k_s}, ${arg});`;
         }, true);
 }

tests/api-output/parseSetAttribute/basic-7.toml

@@ -2,6 +2,6 @@ instructions = [
   """const parseSetAttributeElem = await page.$(\"a\");
 if (parseSetAttributeElem === null) { throw '\"a\" not found'; }
 await page.evaluate(e => {
-    e.removeAttribute(\"b\");
+    e.setAttribute(\"b\",true);
 }, parseSetAttributeElem);""",
 ]

tests/api-output/parseSetAttribute/basic-8.toml

@@ -0,0 +1,7 @@
+instructions = [
+  """const parseSetAttributeElem = await page.$(\"a\");
+if (parseSetAttributeElem === null) { throw '\"a\" not found'; }
+await page.evaluate(e => {
+    e.setAttribute(\"b\",12);
+}, parseSetAttributeElem);""",
+]

tests/api-output/parseSetCss/basic-8.toml

@@ -0,0 +1,7 @@
+instructions = [
+  """const parseSetCssElem = await page.$(\"a\");
+if (parseSetCssElem === null) { throw '\"a\" not found'; }
+await page.evaluate(e => {
+    e.style[\"b\"] = \"12\";
+}, parseSetCssElem);""",
+]

tests/api-output/parseSetProperty/basic-8.toml

@@ -0,0 +1,24 @@
+instructions = [
+  """const parseSetPropertyElem = await page.$(\"a\");
+if (parseSetPropertyElem === null) { throw '\"a\" not found'; }
+await page.evaluate(e => {
+    function setObjValue(object, path, value) {
+        for (let i = 0; i < path.length - 1; ++i) {
+            const subPath = path[i];
+            if (object[subPath] === undefined || object[subPath] === null) {
+                if (value === undefined) {
+                    return;
+                }
+                object[subPath] = {};
+            }
+            object = object[subPath];
+        }
+        if (value === undefined) {
+            delete object[path[path.length - 1]];
+        } else {
+            object[path[path.length - 1]] = value;
+        }
+    }
+    setObjValue(e, [\"b\"], 12);
+}, parseSetPropertyElem);""",
+]

tools/api.js

@@ -559,6 +559,7 @@ function checkAttributeProperty(x, func) {
     func('("a", {"b": null, "a": "b"})', 'basic-6');
     // This one will fail for `set-css`.
     func('("a", {"b": true})', 'basic-7');
+    func('("a", {"b": 12})', 'basic-8');
 
     // XPath
     func('("/a", "b", "c")', 'xpath-1');