Build ACT earlResult into engine archives (#772)

* Flatten rule folder * Generate the rule index * Fix dependency that's not for aria_semantics rules * Publish ACT results with engine * Test update Co-authored-by: eirckr <[email protected]>
IBMa · Mar 29, 2022 · d4e60b3 · d4e60b3
1 parent dd87398
commit d4e60b3
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 15 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -33,6 +33,14 @@ jobs:
         working-directory: rule-server
       - run: npm run build
         working-directory: rule-server
+      - run: node main.js &
+        working-directory: rule-server/dist
+      - run: sleep 10
+        working-directory: rule-server/dist
+      - run: npm install
+        working-directory: accessibility-checker
+      - run: npm test
+        working-directory: accessibility-checker/test-act
       - run: gitactions/publish/achecker-engine.sh
         env: 
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

diff --git a/accessibility-checker-engine/src/v4/rules/Rpt_Aria_ValidRole.ts b/accessibility-checker-engine/src/v4/rules/Rpt_Aria_ValidRole.ts
@@ -22,16 +22,16 @@ export let Rpt_Aria_ValidRole: Rule = {
         "en-US": {
             "group": `Rpt_Aria_ValidRole.html`,
             "Pass_0": `Rpt_Aria_ValidRole.html`,
-            "Fail_1": `Rpt_Aria_ValidRole.html`,
-            "Fail_2": `Rpt_Aria_ValidRole.html`
+            "Fail_2": `Rpt_Aria_ValidRole.html`,
+            "Potential_1": `Rpt_Aria_ValidRole.html`
         }
     },
     messages: {
         "en-US": {
             "group": "Elements must have a valid 'role' per ARIA specification",
             "Pass_0": "Rule Passed",
             "Fail_2": "The role '{0}' defined on the element is not valid per ARIA specification",
-            "Fail_1": "Some of the roles, '{0}', defined on the element are not valid per ARIA specification"
+            "Potential_1": "Some of the roles, '{0}', defined on the element are not valid per ARIA specification"
         }
     },
     rulesets: [{
@@ -65,7 +65,7 @@ export let Rpt_Aria_ValidRole: Rule = {
         if (invalidRoles.length === roles.length) {
             return RuleFail("Fail_2", [invalidRoles.join(",")]);
         } else if (invalidRoles.length > 0) {
-            return RulePotential("Fail_1", [invalidRoles.join(",")]);
+            return RulePotential("Potential_1", [invalidRoles.join(",")]);
         } else {
             return RulePass("Pass_0");
         }

diff --git a/...sibility/rules/HAAC_Aria_Native_Host_Semantics_ruleunit/InValidRoleSpecifiedMultiple.html b/...sibility/rules/HAAC_Aria_Native_Host_Semantics_ruleunit/InValidRoleSpecifiedMultiple.html
@@ -280,7 +280,7 @@ <h1 id="contents1">Button 1 Label</h1>
                         "dom": "/html[1]/body[1]",
                         "aria": "/status[1]/separator[1]"
                     },
-                    "reasonId": "Fail_1",
+                    "reasonId": "Potential_1",
                     "message": "Some of the roles, 'test', defined on the element are not valid per ARIA specification",
                     "messageArgs": [
                         "test"

diff --git a/accessibility-checker/test-act/earlResult.json b/accessibility-checker/test-act/earlResult.json
@@ -5168,7 +5168,7 @@
         {
           "@type": "Assertion",
           "test": {
-            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_1,Fail_2"
+            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_2,Fail_1"
           },
           "result": {
             "outcome": "earl:passed"
@@ -5183,7 +5183,7 @@
         {
           "@type": "Assertion",
           "test": {
-            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_1,Fail_2"
+            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_2,Fail_1"
           },
           "result": {
             "outcome": "earl:passed"
@@ -5198,7 +5198,7 @@
         {
           "@type": "Assertion",
           "test": {
-            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_1,Fail_2"
+            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_2,Fail_1"
           },
           "result": {
             "outcome": "earl:cantTell"
@@ -5213,7 +5213,7 @@
         {
           "@type": "Assertion",
           "test": {
-            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_1,Fail_2"
+            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_2,Fail_1"
           },
           "result": {
             "outcome": "earl:failed"
@@ -5228,7 +5228,7 @@
         {
           "@type": "Assertion",
           "test": {
-            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_1,Fail_2"
+            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_2,Fail_1"
           },
           "result": {
             "outcome": "earl:failed"
@@ -5243,7 +5243,7 @@
         {
           "@type": "Assertion",
           "test": {
-            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_1,Fail_2"
+            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_2,Fail_1"
           },
           "result": {
             "outcome": "earl:inapplicable"
@@ -5258,7 +5258,7 @@
         {
           "@type": "Assertion",
           "test": {
-            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_1,Fail_2"
+            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_2,Fail_1"
           },
           "result": {
             "outcome": "earl:inapplicable"
@@ -5273,7 +5273,7 @@
         {
           "@type": "Assertion",
           "test": {
-            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_1,Fail_2"
+            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_2,Fail_1"
           },
           "result": {
             "outcome": "earl:inapplicable"
@@ -5288,7 +5288,7 @@
         {
           "@type": "Assertion",
           "test": {
-            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_1,Fail_2"
+            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_2,Fail_1"
           },
           "result": {
             "outcome": "earl:inapplicable"
@@ -5303,7 +5303,7 @@
         {
           "@type": "Assertion",
           "test": {
-            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_1,Fail_2"
+            "title": "Rpt_Aria_ValidRole:Pass_0,Fail_2,Fail_1"
           },
           "result": {
             "outcome": "earl:inapplicable"

diff --git a/gitactions/publish/achecker-engine.sh b/gitactions/publish/achecker-engine.sh
@@ -1,6 +1,7 @@
 if [ -n "${GITHUB_REF:10}" ]; then
     cd ./accessibility-checker-engine/dist
     cp ../../rule-server/dist/static/archives.json ./
+    cp ../../accessibility-checker/test-act/earlResult.json ./
     echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >.npmrc;
     NPM_VERSION="${GITHUB_REF:10}";
     echo "Deploy accessibility-checker-engine version ${NPM_VERSION}...";