chore(all): Promote 4.x to main

.github/workflows/test.yml

@@ -123,15 +123,15 @@ jobs:
       - run: npm run build
         working-directory: accessibility-checker
 
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Baselines/*.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Baselines/*.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Functions.Defined/*.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Functions.Defined/*.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.ObjectStructure/*.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.ObjectStructure/*.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.assertionCompliance.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.assertionCompliance.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.Puppeteer.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.Puppeteer.test.mjs
         working-directory: accessibility-checker
 
 ###############################################################################
@@ -142,7 +142,7 @@ jobs:
 
       strategy:
         matrix:
-          node-version: [14.x, 18.x]
+          node-version: [18.x]
 
       steps:
       - uses: actions/checkout@v3
@@ -171,15 +171,15 @@ jobs:
       - run: npm run build
         working-directory: accessibility-checker
 
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Baselines/*.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Baselines/*.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Functions.Defined/*.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Functions.Defined/*.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.ObjectStructure/*.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.ObjectStructure/*.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.assertionCompliance.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.assertionCompliance.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.Puppeteer.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.Puppeteer.test.mjs
         working-directory: accessibility-checker
 
 ###############################################################################
@@ -219,9 +219,9 @@ jobs:
       - run: npm run build
         working-directory: accessibility-checker
 
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.URL.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.URL.test.mjs
         working-directory: accessibility-checker
 
 ###############################################################################
@@ -261,9 +261,9 @@ jobs:
       - run: npm run build
         working-directory: accessibility-checker
 
-      - run: npx mocha -R dot test/mocha/aChecker.Slow1/aChecker.Scans/**/*.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Slow1/aChecker.Scans/**/*.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Slow1/aChecker.ObjectStructure/**/*.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Slow1/aChecker.ObjectStructure/**/*.test.mjs
         working-directory: accessibility-checker
 
 

accessibility-checker-engine/test/v2/checker/accessibility/rules/text_contrast_sufficient_ruleunit/act_pass_10.html

@@ -7,7 +7,10 @@
 
 <body>
 
-  <button>My button!</button>
+    <!-- Specify the background style because Windows default colors are #f0f0f0 
+        instead of #efefef used by Mac / Linux
+    -->
+  <button style="background-color: #efefef;">My button!</button>
 
 <script type="text/javascript">
         UnitTest = {

accessibility-checker/.gitignore

@@ -8,4 +8,5 @@ results
 package-lock.json
 src/**/*.js
 src/**/*.map
-src/**/*.d.ts
+src/**/*.d.ts
+!src/bin/achecker.js

accessibility-checker/boilerplates/cucumber-selenium/features/Demo.feature

@@ -1,15 +1,15 @@
 Feature: Cucumber Demo
     Demonstrate a basic usage of AAT
 
-    Scenario: Check pages and fail when issues found
-        Given I am at URL "http://www.altoromutual.com/"
-        Then Page is accessible with label "DEMO1"
-        When I click on ID "CatLink1"
-        Then Page is accessible with label "DEMO1_Personal"
+#    Scenario: Check pages and fail when issues found
+#        Given I am at URL "https://altoromutual.12mc9fdq8fib.us-south.codeengine.appdomain.cloud/#"
+#        Then Page is accessible with label "DEMO1"
+#        When I click on ID "feedbackButton"
+#        Then Page is accessible with label "DEMO1_Personal"
 
     Scenario: Check pages, but just record results when issues found
-        Given I am at URL "http://www.altoromutual.com/"
+        Given I am at URL "https://altoromutual.12mc9fdq8fib.us-south.codeengine.appdomain.cloud/#"
         Then Scan page for accessibility with label "DEMO2"
-        When I click on ID "CatLink1"
+        When I click on ID "feedbackButton"
         Then Scan page for accessibility with label "DEMO2_Personal"
 

accessibility-checker/boilerplates/cucumber-selenium/features/step_definitions/browser_step.js

@@ -23,11 +23,16 @@ When(/^I click on XPath "([^"]*)"$/, function(selector) {
     });
 });
 
-When(/^I click on ID "([^"]*)"$/, function(selector) {
+When(/^I click on ID "([^"]*)"$/, async function(selector) {
     const myThis = this;
     const condition = until.elementLocated(By.id(selector));
-    return myThis.driver.wait(condition, 8000).then(function() {
-        return myThis.driver.findElement(By.id(selector)).click();
+    return myThis.driver.wait(condition, 8000).then(async function() {
+        let elem = await myThis.driver.findElement(By.id(selector));
+        let rect = await elem.getRect();
+        await myThis.driver.executeScript(`window.scrollTo(${rect.x+rect.width}, ${rect.y+rect.height});`);
+        await myThis.driver.sleep(2000);
+        await elem.click();
+        await myThis.driver.sleep(2000);
     });
 });
 

accessibility-checker/boilerplates/cucumber-selenium/features/step_definitions/hooks.js

@@ -25,11 +25,11 @@ function getBrowserChrome() {
 
     const options = new chrome.Options();
     options.addArguments("--disable-dev-shm-usage");
-    options.addArguments("--headless");
+    options.addArguments("--headless=new");
     options.addArguments('--ignore-certificate-errors')
 
     let service = new chrome.ServiceBuilder(spath).build();
-    chrome.setDefaultService(service);
+    chrome.Driver.createSession(options, service);
 
     return new webdriver.Builder()
         .withCapabilities(webdriver.Capabilities.chrome())
@@ -59,7 +59,6 @@ const {BeforeAll, AfterAll, Before} = require("cucumber");
 
     BeforeAll(function() {
         driver = getBrowser();
-
         /*
         return new Promise(function(resolve, reject) {
             aChecker.onRunComplete(resolve);

accessibility-checker/boilerplates/cucumber-selenium/package.json

@@ -12,7 +12,7 @@
     "eslint": "^7.0.0",
     "html-escape": "^2.0.0",
     "line-reader": "^0.4.0",
-    "selenium-webdriver": "4.3.0"
+    "selenium-webdriver": "4.9.2"
   },
   "dependencies": {}
 }

accessibility-checker/boilerplates/jest-puppeteer-ts/.gitignore

@@ -0,0 +1 @@
+results

accessibility-checker/boilerplates/jest-puppeteer-ts/achecker.js

@@ -0,0 +1,52 @@
+module.exports = {
+  // optional - Specify the rule archive
+  // Default: latest
+  // Run `npx aat archives` for a list of valid ruleArchive ids and policy ids
+  ruleArchive: 'latest',
+
+  // optional - Specify one or many policies to scan.
+  // Run `npx aat archives` for a list of valid ruleArchive ids and policy ids
+  policies: [ "IBM_Accessibility"],
+
+  // optional - Specify one or many violation levels on which to fail the test
+  //            i.e. If specified violation then the testcase will only fail if
+  //                 a violation is found during the scan.
+  // i.e. failLevels: ["violation"]
+  // i.e. failLevels: ["violation","potential violation"] or refer to below as a list
+  // Default: ["violation","potential violation"]
+  failLevels: [ "violation" ],
+
+  // optional - Specify one or many violation levels which should be reported
+  //            i.e. If specified violation then in the report it would only contain
+  //                 results which are level of violation.
+  // i.e. reportLevels: ["violation"]
+  // Valid values: violation, potentialviolation, recommendation, potentialrecommendation, manual
+  // Default: ["violation","potential violation"]
+  reportLevels: [
+      "violation",
+      "potentialviolation",
+      "recommendation",
+      "potentialrecommendation",
+      "manual"
+  ],
+
+  // Optional - Which type should the results be outputted to
+  // Valid values: json, csv
+  // Default: json
+  outputFormat: [ "json" ],
+
+  // Optional - Specify labels that you would like associated to your scan
+  //
+  // i.e.
+  //   label: ["Firefox","master","V12","Linux"]
+  // Default: N/A
+  label: [],
+
+  // optional - Where the scan results should be saved.
+  // Default: results
+  outputFolder: "results",
+
+  // optional - Where the baseline results should be loaded from
+  // Default: baselines
+  baselineFolder: "baselines",
+}

accessibility-checker/boilerplates/jest-puppeteer-ts/matchers/toBeAccessible.ts

@@ -0,0 +1,26 @@
+/**
+ * Copyright IBM Corp. 2019
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+import { assertCompliance, getCompliance, stringifyResults } from "accessibility-checker";
+import { Page } from "puppeteer";
+
+async function toBeAccessible(node: Page) {
+  let results = await getCompliance(node, this.currentTestName.replace(/[ \\/]/g, "_"));
+  if (assertCompliance(results.report) === 0) {
+    return {
+      pass: true
+    }
+  } else {
+    return {
+      pass:false,
+      message: () => stringifyResults(results.report)
+    }
+  }
+}
+module.exports = toBeAccessible;

accessibility-checker/boilerplates/jest-puppeteer-ts/package.json

@@ -0,0 +1,29 @@
+{
+  "name": "@ibma/eac-jest-boilerplate",
+  "version": "3.0.0",
+  "description": "Example usage of IBM Equal Access Checker with Jest, Puppeteer, and Typescript",
+  "scripts": {
+    "test": "jest test-ts/*.test.ts"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "jest": {
+    "preset": "ts-jest",
+    "setupFilesAfterEnv": [
+      "./setupAfterEnv.ts"
+    ],
+    "transformIgnorePatterns": [
+      "ace-node\\.js"
+    ]
+  },
+  "devDependencies": {
+    "@jest/globals": "^29.5.0",
+    "@types/jest": "^29.5.1",
+    "accessibility-checker": "*",
+    "jest": "^29.5.0",
+    "puppeteer": "^20.2.1",
+    "ts-jest": "^29.1.0",
+    "typescript": "^4.1.5"
+  }
+}

accessibility-checker/boilerplates/jest-puppeteer-ts/sample/Hello.html

@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html ng-app="helloApp" ng-controller="helloCtrl" lang='{{locale}}'>
+
+<head>
+    <title>Sample App</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/angular_material/1.1.0/angular-material.min.css">
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular.min.js"></script>
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular-animate.min.js"></script>
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular-aria.min.js"></script>
+    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angular_material/1.1.0/angular-material.min.js"></script>
+    <script type="text/javascript" src="Hello.js"></script>
+</head>
+
+<body ng-cloak layout="column">
+    <md-toolbar layout="row" class="md-toolbar-tools" role="banner">
+        <h1>Sample App</h1>
+    </md-toolbar>
+
+    <div flex layout="row">
+
+        <md-sidenav md-is-locked-open="true" class="md-whiteframe-4dp" role="navigation">
+            Sidenav
+        </md-sidenav>
+
+        <md-content flex id="content" role="main">
+            <a id="clickMe" ng-click="showCard = !showCard">Click Me</a>
+            <md-card ng-if="showCard">
+                <md-card-content>
+                    <h2>Card headline</h2>
+                    <p>Card content</p>
+                    <img src="hello.png" />
+                </md-card-content>
+                <md-card-footer>
+                    Card footer
+                </md-card-footer>
+            </md-card>
+        </md-content>
+
+
+    </div>
+    <div>
+
+    </div>
+
+</body>
+
+</html>

accessibility-checker/boilerplates/jest-puppeteer-ts/sample/Hello.js

@@ -0,0 +1,10 @@
+var app = angular.module("helloApp", ["ngMaterial","ngAria"], function config($ariaProvider) {
+    $ariaProvider.config({
+        bindRoleForClick: false
+    });
+});
+
+app.controller("helloCtrl", function ($scope) {
+    $scope.locale = "en-US";
+    $scope.test = 1+2;
+});

accessibility-checker/boilerplates/jest-puppeteer-ts/setupAfterEnv.ts

@@ -0,0 +1,2 @@
+const toBeAccessible = require('./matchers/toBeAccessible');
+expect.extend({ toBeAccessible });

accessibility-checker/boilerplates/jest-puppeteer-ts/src/HelloWidget.js

@@ -0,0 +1,9 @@
+var React = require("react");
+
+var HelloWidget = React.createClass({
+    render: function () {
+        return "<div>Hello {this.props.name}</div>";
+    }
+});
+
+module.exports = HelloWidget;