address review feedback

openwebdocs · Dec 19, 2023 · 29afa8f · 29afa8f
1 parent 7b540cd
commit 29afa8f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 40 deletions.
diff --git a/custom/tests.yaml b/custom/tests.yaml
@@ -5188,22 +5188,6 @@ javascript:
             return {result: false, message: e.message};
           }
 
-svg:
-  elements:
-    a:
-      xlink_actuate: |-
-        var instance = document.createElementNS('http://www.w3.org/2000/svg', 'a');
-        instance.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:actuate', 'onRequest');
-        return !!instance && instance.getAttributeNS('http://www.w3.org/1999/xlink', 'actuate') === 'onRequest';
-      xlink_show: |-
-        var instance = document.createElementNS('http://www.w3.org/2000/svg', 'a');
-        instance.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:show', 'new');
-        return !!instance && instance.getAttributeNS('http://www.w3.org/1999/xlink', 'show') === 'new';
-      xlink_title: |-
-        var instance = document.createElementNS('http://www.w3.org/2000/svg', 'a');
-        instance.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:show', 'newTitle');
-        return !!instance && instance.getAttributeNS('http://www.w3.org/1999/xlink', 'show') === 'newTitle';
-
 # Features defined here also need to be in test-builder/webassembly.ts.
 webassembly:
   # Features defined here also need to be in https://webassembly.github.io/spec/web-api/index.html or custom/idl/webassembly.idl.

diff --git a/test-builder/elements.ts b/test-builder/elements.ts
@@ -136,36 +136,31 @@ const build = async (specElements, customElements) => {
             return !!instance && '${attrProp}' in instance;
           })()`;
 
-          // SVG attributes need some tweaks
+          // Some SVG attribute names are reflected differently in SVGOM
           if (category === "svg") {
-            // Certain SVG attributes are reflected differently in SVGOM
-            if (attrProp === "in") {
-              attrCode = attrCode.replace("'in'", "'in1'");
-            }
-            if (attrProp === "kernelUnitLength") {
+            const replacements = {
+              baseFrequency: "baseFrequencyX",
+              in: "in1",
+              kernelUnitLength: "kernelUnitLengthX",
+              order: "orderX",
+              radius: "radiusX",
+              stdDeviation: "stdDeviationX",
+            };
+
+            if (attrProp in replacements) {
               attrCode = attrCode.replace(
-                "kernelUnitLength",
-                "kernelUnitLengthX",
+                `'${attrProp}'`,
+                `'${replacements[attrProp]}'`,
               );
             }
-            if (attrProp === "order") {
-              attrCode = attrCode.replace("order", "orderX");
-            }
-            if (attrProp === "stdDeviation") {
-              attrCode = attrCode.replace("stdDeviation", "stdDeviationX");
-            }
-            if (attrProp === "radius") {
-              attrCode = attrCode.replace("radius", "radiusX");
-            }
-            if (attrProp === "baseFrequency") {
-              attrCode = attrCode.replace("baseFrequency", "baseFrequencyX");
-            }
-            // All xlink:href attributes need special handling
-            if (attrProp === "xlink_href") {
+
+            // All xlink attributes need special handling
+            if (attrProp.startsWith("xlink_")) {
+              const xlinkAttr = attrProp.replace("xlink_", "");
               attrCode = `(function() {
                 var instance = ${defaultConstructCode};
-                instance.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href', 'test');
-                return !!instance && instance.getAttributeNS('http://www.w3.org/1999/xlink', 'href') === 'test'
+                instance.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:${xlinkAttr}', 'test');
+                return !!instance && instance.getAttributeNS('http://www.w3.org/1999/xlink', '${xlinkAttr}') === 'test'
               })()`;
             }
           }