Merge branch 'htmlReportRelease' into htmlReport-2026-nam

IBMa · Sep 12, 2024 · 3accf0d · 3accf0d
2 parents 443b744 + cfcd21c
commit 3accf0d
Show file tree

Hide file tree

Showing 75 changed files with 6,777 additions and 378 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -44,7 +44,7 @@ jobs:
     - run: npm run package:browser
       working-directory: accessibility-checker-extension
     - name: Upload packed extension
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: accessibility-checker-extension for Chrome
         path: accessibility-checker-extension/package/accessibility-checker-extension.zip
@@ -53,7 +53,7 @@ jobs:
     - run: npm run package:browser
       working-directory: accessibility-checker-extension
     - name: Upload packed extension
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: accessibility-checker-extension for Firefox
         path: accessibility-checker-extension/package/accessibility-checker-extension.zip
@@ -92,7 +92,7 @@ jobs:
     - run: npm test
       working-directory: accessibility-checker/test-act-w3
     - name: Upload packed extension
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: ACT Text Results
         path: accessibility-checker/test-act-w3/act-report-v2.txt

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -173,7 +173,7 @@ jobs:
     - run: npm run package:browser
       working-directory: accessibility-checker-extension
     - name: Upload packed extension
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: accessibility-checker-extension for Chrome
         path: accessibility-checker-extension/package/accessibility-checker-extension.zip
@@ -195,7 +195,7 @@ jobs:
     - run: npm run package:browser
       working-directory: accessibility-checker-extension
     - name: Upload packed extension
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: accessibility-checker-extension for Firefox
         path: accessibility-checker-extension/package/accessibility-checker-extension.zip
@@ -222,4 +222,46 @@ jobs:
         BLUEMIX_USERID: apikey
         BLUEMIX_PASS: ${{ secrets.BLUEMIX_PASS }}
         CLOUD_PWD: ${{ secrets.CLOUD_PWD }}
-        TRAVIS_BRANCH: prod
+        TRAVIS_BRANCH: prod
+
+  java-accessibility-checker-deploy:
+    runs-on: ubuntu-22.04
+    permissions:
+      packages: write
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'semeru' # See 'Supported distributions' for available options
+        java-version: '17'
+        server-id: central
+        server-username: ${{ secrets.MVN_GITHUB_USER }}
+        server-password: ${{ secrets.MVN_GITHUB_TOKEN }}
+    - uses: s4u/maven-settings-action@v3.0.0
+      with:
+        servers: |
+          [{
+            "id": "central",
+            "username": "${{ secrets.MVN_GITHUB_USER }}",
+            "password": "${{ secrets.MVN_GITHUB_TOKEN }}"
+          }]
+    - name: Configure GPG Key
+      run: echo "$GPG_SIGNING_KEY" >private.key
+      env:
+        GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
+    - name: Import GPG Key
+      run: gpg --pinentry-mode=loopback --passphrase "$GPG_SIGNING_KEY_PASS" --import private.key
+      env:
+        GPG_SIGNING_KEY_PASS: ${{ secrets.GPG_SIGNING_KEY_PASS }}
+    - name: Set version
+      run: sed -i'.old' -e 's/\<version\>3\.0\.0\<\/version\>/\<version\>'"${GITHUB_REF:10}"'\<\/version\>/g' ./pom.xml
+      working-directory: java-accessibility-checker
+    - name: Publish package
+      run: mvn --batch-mode deploy -DskipTests -Dgpg.passphrase=$GPG_SIGNING_KEY_PASS
+      working-directory: java-accessibility-checker
+      env:
+        GPG_SIGNING_KEY_PASS: ${{ secrets.GPG_SIGNING_KEY_PASS }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -42,7 +42,7 @@ jobs:
     - run: npx mocha ./test/mocha/help/help.test.js
       working-directory: accessibility-checker-engine
     - name: Upload rule listing
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: Rule listing
         path: accessibility-checker-engine/dist/help/rules.html
@@ -84,7 +84,7 @@ jobs:
     - run: npm test
       working-directory: accessibility-checker/test-act-w3
     - name: Upload packed extension
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: ACT Text Results
         path: accessibility-checker/test-act-w3/act-report-v2.txt
@@ -361,6 +361,77 @@ jobs:
     - run: npm run wdio
       working-directory: accessibility-checker/test/webdriverio
 
+###############################################################################
+# Java test
+####
+  java-accessibility-checker-selenium-test:
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'semeru' # See 'Supported distributions' for available options
+        java-version: '17'
+    - name: Latest Chrome
+      uses: browser-actions/setup-chrome@v1
+      with:
+        chrome-version: latest
+        install-chromedriver: true
+      id: setup-chrome
+    - run: npm install
+      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
+    - name: Test package
+      run: mvn --batch-mode test -Dtest="AccessibilityCheckerSeleniumTest"
+      working-directory: java-accessibility-checker
+      env: 
+        chromedriverpath: ${{ steps.setup-chrome.outputs.chromedriver-path }}
+        chromebinpath: ${{ steps.setup-chrome.outputs.chrome-path }}
+
+  java-accessibility-checker-playwright-test:
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'semeru' # See 'Supported distributions' for available options
+        java-version: '17'
+    - name: Latest Chrome
+      uses: browser-actions/setup-chrome@v1
+      with:
+        chrome-version: latest
+        install-chromedriver: true
+      id: setup-chrome
+    - run: npm install
+      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
+    - name: Test package
+      run: mvn --batch-mode test -Dtest="AccessibilityCheckerPlaywrightTest"
+      working-directory: java-accessibility-checker
+      env: 
+        chromedriverpath: ${{ steps.setup-chrome.outputs.chromedriver-path }}
+        chromebinpath: ${{ steps.setup-chrome.outputs.chrome-path }}
+
 ###############################################################################
 # Karma Tests
 ####
@@ -491,7 +562,7 @@ jobs:
       run: npm test
       working-directory: accessibility-checker-extension/test
     - name: Upload packed extension
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: accessibility-checker-extension for Chrome
         path: accessibility-checker-extension/package/accessibility-checker-extension.zip
@@ -500,7 +571,7 @@ jobs:
     - run: npm run package:browser
       working-directory: accessibility-checker-extension
     - name: Upload packed extension
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: accessibility-checker-extension for Firefox
         path: accessibility-checker-extension/package/accessibility-checker-extension.zip

diff --git a/accessibility-checker-engine/karmaaction.conf.js b/accessibility-checker-engine/karmaaction.conf.js
@@ -63,7 +63,7 @@ module.exports = (config) => {
         customLaunchers: {
             ChromeCustom: {
                 base: 'ChromeHeadless',
-                flags: ['--disable-web-security', '--no-sandbox']
+                flags: ['--disable-gpu', '--disable-web-security', '--no-sandbox']
             }
         },
         preprocessors: {