diff --git a/.yarn/cache/@ibma-aat-https-5590992b11-97048d4e00.zip b/.yarn/cache/@ibma-aat-https-5590992b11-97048d4e00.zip deleted file mode 100644 index e1aefec87efe..000000000000 Binary files a/.yarn/cache/@ibma-aat-https-5590992b11-97048d4e00.zip and /dev/null differ diff --git a/.yarn/cache/chromedriver-npm-78.0.1-ff60f97ce6-6ba4636286.zip b/.yarn/cache/chromedriver-npm-78.0.1-ff60f97ce6-6ba4636286.zip deleted file mode 100644 index 26d809a6b2c5..000000000000 Binary files a/.yarn/cache/chromedriver-npm-78.0.1-ff60f97ce6-6ba4636286.zip and /dev/null differ diff --git a/.yarn/cache/del-npm-4.1.1-8bc04567c6-87eecb2af5.zip b/.yarn/cache/del-npm-4.1.1-8bc04567c6-87eecb2af5.zip deleted file mode 100644 index 5bb9aa5ce5ae..000000000000 Binary files a/.yarn/cache/del-npm-4.1.1-8bc04567c6-87eecb2af5.zip and /dev/null differ diff --git a/.yarn/cache/is-path-in-cwd-npm-2.1.0-2a2ca98522-d814427f4e.zip b/.yarn/cache/is-path-in-cwd-npm-2.1.0-2a2ca98522-d814427f4e.zip deleted file mode 100644 index 756bcff848f6..000000000000 Binary files a/.yarn/cache/is-path-in-cwd-npm-2.1.0-2a2ca98522-d814427f4e.zip and /dev/null differ diff --git a/.yarn/cache/is-path-inside-npm-2.1.0-f943552e7a-e289fc4ec6.zip b/.yarn/cache/is-path-inside-npm-2.1.0-f943552e7a-e289fc4ec6.zip deleted file mode 100644 index 1028480bfbe0..000000000000 Binary files a/.yarn/cache/is-path-inside-npm-2.1.0-f943552e7a-e289fc4ec6.zip and /dev/null differ diff --git a/.yarn/cache/puppeteer-npm-2.0.0-85251b9d16-b3fef727c2.zip b/.yarn/cache/puppeteer-npm-2.0.0-85251b9d16-b3fef727c2.zip deleted file mode 100644 index d431281471b8..000000000000 Binary files a/.yarn/cache/puppeteer-npm-2.0.0-85251b9d16-b3fef727c2.zip and /dev/null differ diff --git a/aat/aat.js b/aat/aat.js deleted file mode 100644 index c175408a99e9..000000000000 --- a/aat/aat.js +++ /dev/null @@ -1,46 +0,0 @@ -module.exports = { - // optional - Specify the rule archive - // Default: latest - // Run `npx aat archives` for a list of valid ruleArchive ids and policy ids - ruleArchive: '2019SeptDeploy', - - // 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'], - - // 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: '.aat/results', - - // optional - Where the baseline results should be loaded from - // Default: baselines - baselineFolder: '.aat/baselines', -}; diff --git a/config/jest-config-carbon/matchers/toHaveNoDAPViolations.js b/config/jest-config-carbon/matchers/toHaveNoDAPViolations.js deleted file mode 100644 index 7b9595040de0..000000000000 --- a/config/jest-config-carbon/matchers/toHaveNoDAPViolations.js +++ /dev/null @@ -1,33 +0,0 @@ -/** - * 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'; - -let AAT; - -async function toHaveNoDAPViolations(node, label) { - // We defer initialization of AAT as it seems to have a race condition if - // we are running a test suite in node instead of jsdom. As a result, we only - // initialize it if this matcher is called - if (!AAT) { - AAT = require('@ibma/aat'); - } - - const results = await AAT.getCompliance(node, label); - if (AAT.assertCompliance(results.report) === 0) { - return { - pass: true, - }; - } else { - return { - pass: false, - message: () => AAT.stringifyResults(results.report), - }; - } -} - -module.exports = toHaveNoDAPViolations; diff --git a/config/jest-config-carbon/package.json b/config/jest-config-carbon/package.json index 0c681440c422..cd5570ca1134 100644 --- a/config/jest-config-carbon/package.json +++ b/config/jest-config-carbon/package.json @@ -27,7 +27,6 @@ "@babel/preset-env": "^7.10.0", "@babel/preset-react": "^7.10.0", "@babel/runtime": "^7.10.0", - "@ibma/aat": "https://able.ibm.com/tools/dist/ibma-aat-2.0.6.tgz", "accessibility-checker": "^3.1.1", "axe-core": "^3.3.2", "babel-jest": "^26.0.1", diff --git a/config/jest-config-carbon/setup/setupAfterEnv.js b/config/jest-config-carbon/setup/setupAfterEnv.js index 18ac7c927e2a..ee334a8f3814 100644 --- a/config/jest-config-carbon/setup/setupAfterEnv.js +++ b/config/jest-config-carbon/setup/setupAfterEnv.js @@ -8,7 +8,6 @@ const chalk = require('chalk'); const util = require('util'); const toHaveNoAxeViolations = require('../matchers/toHaveNoAxeViolations'); -const toHaveNoDAPViolations = require('../matchers/toHaveNoDAPViolations'); const toHaveNoACViolations = require('../matchers/toHaveNoACViolations'); // We can extend `expect` using custom matchers as defined by: @@ -24,7 +23,6 @@ const toHaveNoACViolations = require('../matchers/toHaveNoACViolations'); // https://jestjs.io/docs/en/configuration.html#setupfilesafterenv-array expect.extend({ toHaveNoAxeViolations, - toHaveNoDAPViolations, toHaveNoACViolations, }); diff --git a/packages/react/src/components/CodeSnippet/__tests__/CodeSnippet.Skeleton-test.js b/packages/react/src/components/CodeSnippet/__tests__/CodeSnippet.Skeleton-test.js index 20038e7feb33..f57e3fbc1b87 100644 --- a/packages/react/src/components/CodeSnippet/__tests__/CodeSnippet.Skeleton-test.js +++ b/packages/react/src/components/CodeSnippet/__tests__/CodeSnippet.Skeleton-test.js @@ -26,10 +26,10 @@ describe('CodeSnippetSkeleton', () => { ); it.each(snippetTypes)( - 'should have no DAP violations with type="%s"', + 'should have no AC violations with type="%s"', async (type) => { const { container } = render(); - await expect(container).toHaveNoDAPViolations( + await expect(container).toHaveNoACViolations( `CodeSnippetSkeleton-${type}` ); } diff --git a/packages/react/src/components/FileUploader/__tests__/FileUploader-test.js b/packages/react/src/components/FileUploader/__tests__/FileUploader-test.js index d692711e41bc..e6acd3fc319f 100644 --- a/packages/react/src/components/FileUploader/__tests__/FileUploader-test.js +++ b/packages/react/src/components/FileUploader/__tests__/FileUploader-test.js @@ -20,9 +20,9 @@ describe('FileUploader', () => { await expect(container).toHaveNoAxeViolations(); }); - it.skip('should have no DAP violations', async () => { + it.skip('should have no AC violations', async () => { const { container } = render(); - await expect(container).toHaveNoDAPViolations('FileUploader'); + await expect(container).toHaveNoACViolations('FileUploader'); }); }); diff --git a/packages/react/src/components/FileUploader/__tests__/FileUploaderSkeleton-test.js b/packages/react/src/components/FileUploader/__tests__/FileUploaderSkeleton-test.js index ca69eee2090e..b4a60859bb2a 100644 --- a/packages/react/src/components/FileUploader/__tests__/FileUploaderSkeleton-test.js +++ b/packages/react/src/components/FileUploader/__tests__/FileUploaderSkeleton-test.js @@ -18,9 +18,9 @@ describe('FileUploaderSkeleton', () => { await expect(container).toHaveNoAxeViolations(); }); - it('should have no DAP violations', async () => { + it('should have no AC violations', async () => { const { container } = render(); - await expect(container).toHaveNoDAPViolations('FileUploaderSkeleton'); + await expect(container).toHaveNoACViolations('FileUploaderSkeleton'); }); }); diff --git a/packages/react/src/components/FileUploader/__tests__/Filename-test.js b/packages/react/src/components/FileUploader/__tests__/Filename-test.js index 085850f99fe6..b007a8d222a1 100644 --- a/packages/react/src/components/FileUploader/__tests__/Filename-test.js +++ b/packages/react/src/components/FileUploader/__tests__/Filename-test.js @@ -28,12 +28,12 @@ describe('Filename', () => { ); it.each(statuses)( - 'should have no DAP violations with status %s', + 'should have no AC violations with status %s', async (status) => { const { container } = render( ); - await expect(container).toHaveNoDAPViolations(`Filename-${status}`); + await expect(container).toHaveNoACViolations(`Filename-${status}`); } ); }); diff --git a/packages/react/src/components/Loading/Loading-test.js b/packages/react/src/components/Loading/Loading-test.js index 86465abbce79..7b60a9d77815 100644 --- a/packages/react/src/components/Loading/Loading-test.js +++ b/packages/react/src/components/Loading/Loading-test.js @@ -23,9 +23,9 @@ describe('Loading', () => { await expect(container).toHaveNoAxeViolations(); }); - it('should have no DAP violations', async () => { + it('should have no AC violations', async () => { const { container } = render(); - await expect(container).toHaveNoDAPViolations('Loading'); + await expect(container).toHaveNoACViolations('Loading'); }); }); diff --git a/packages/react/src/components/MultiSelect/__tests__/MultiSelect-test.js b/packages/react/src/components/MultiSelect/__tests__/MultiSelect-test.js index 1ea3f43552ee..70517c2964aa 100644 --- a/packages/react/src/components/MultiSelect/__tests__/MultiSelect-test.js +++ b/packages/react/src/components/MultiSelect/__tests__/MultiSelect-test.js @@ -25,12 +25,12 @@ describe('MultiSelect', () => { await expect(container).toHaveNoAxeViolations(); }); - it('should have no DAP violations', async () => { + it('should have no AC violations', async () => { const items = generateItems(4, generateGenericItem); const { container } = render( ); - await expect(container).toHaveNoDAPViolations(); + await expect(container).toHaveNoACViolations('MultiSelect'); }); }); diff --git a/packages/react/src/components/Tag/Tag-test.js b/packages/react/src/components/Tag/Tag-test.js index 7bcb1b3a1703..85a38d707ff8 100644 --- a/packages/react/src/components/Tag/Tag-test.js +++ b/packages/react/src/components/Tag/Tag-test.js @@ -23,13 +23,13 @@ describe('Tag', () => { await expect(container).toHaveNoAxeViolations(); }); - it('should have no DAP violations', async () => { + it('should have no AC violations', async () => { const { container } = render(
This is not a tag
); - await expect(container).toHaveNoDAPViolations('Tag'); + await expect(container).toHaveNoACViolations('Tag'); }); }); diff --git a/yarn.lock b/yarn.lock index cc6bbbaec71a..9aed3f6c7785 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3510,20 +3510,6 @@ __metadata: languageName: node linkType: hard -"@ibma/aat@https://able.ibm.com/tools/dist/ibma-aat-2.0.6.tgz": - version: 2.0.6 - resolution: "@ibma/aat@https://able.ibm.com/tools/dist/ibma-aat-2.0.6.tgz" - dependencies: - chromedriver: ^78.0.1 - deep-diff: ^0.3.4 - js-yaml: ^3.13.1 - puppeteer: ^2.0.0 - bin: - aat: ./bin/aat.js - checksum: 97048d4e001d976cf26d82d0f022f67cba02235033cbead38333fd8a67c34f517bc2c457585d90e4a85e9633c0baee4382461ddaf54e34db6235d20f0bc303d2 - languageName: node - linkType: hard - "@icons/material@npm:^0.2.4": version: 0.2.4 resolution: "@icons/material@npm:0.2.4" @@ -10782,21 +10768,6 @@ __metadata: languageName: node linkType: hard -"chromedriver@npm:^78.0.1": - version: 78.0.1 - resolution: "chromedriver@npm:78.0.1" - dependencies: - del: ^4.1.1 - extract-zip: ^1.6.7 - mkdirp: ^0.5.1 - request: ^2.88.0 - tcp-port-used: ^1.0.1 - bin: - chromedriver: ./bin/chromedriver - checksum: 6ba46362862785de4a5f27dc66857d03aaca8de8bad03160c2e7a1e881f9c2d6303148bb84c758f57ed4e303deb48c3311be67697465b4c8b46ea643805ccbcd - languageName: node - linkType: hard - "chromedriver@npm:^83.0.0": version: 83.0.1 resolution: "chromedriver@npm:83.0.1" @@ -12941,21 +12912,6 @@ __metadata: languageName: node linkType: hard -"del@npm:^4.1.1": - version: 4.1.1 - resolution: "del@npm:4.1.1" - dependencies: - "@types/glob": ^7.1.1 - globby: ^6.1.0 - is-path-cwd: ^2.0.0 - is-path-in-cwd: ^2.0.0 - p-map: ^2.0.0 - pify: ^4.0.1 - rimraf: ^2.6.3 - checksum: 87eecb2af52e794f8d9c8d200a31e0032cec8c255f08a97ef28be771bf561f16023746f2329d7b436e0a1fe09abafe80a25b2546131aa809cbd9a6bf49220cf3 - languageName: node - linkType: hard - "del@npm:^5.0.0, del@npm:^5.1.0": version: 5.1.0 resolution: "del@npm:5.1.0" @@ -19491,7 +19447,7 @@ __metadata: languageName: node linkType: hard -"is-path-cwd@npm:^2.0.0, is-path-cwd@npm:^2.2.0": +"is-path-cwd@npm:^2.2.0": version: 2.2.0 resolution: "is-path-cwd@npm:2.2.0" checksum: 900f6e81445b9979705952189d7dbada79dbe6d77be3b5fc95aed3dc1cc9d77de5b286db2d525942a72a717c81aa549509b76705883415fb655183dfefce9541 @@ -19507,15 +19463,6 @@ __metadata: languageName: node linkType: hard -"is-path-in-cwd@npm:^2.0.0": - version: 2.1.0 - resolution: "is-path-in-cwd@npm:2.1.0" - dependencies: - is-path-inside: ^2.1.0 - checksum: d814427f4e8757e960031bf9cf202f764a688a7d6be3bc8889335e5dc112e88731fda95556b8b6c7dc030358f4e6385e27ac9af95d0406411fc5271a94abef86 - languageName: node - linkType: hard - "is-path-inside@npm:^1.0.0": version: 1.0.1 resolution: "is-path-inside@npm:1.0.1" @@ -19525,15 +19472,6 @@ __metadata: languageName: node linkType: hard -"is-path-inside@npm:^2.1.0": - version: 2.1.0 - resolution: "is-path-inside@npm:2.1.0" - dependencies: - path-is-inside: ^1.0.2 - checksum: e289fc4ec6df457600bac34068b7c564bf17eee703888d9eea2b0a363a0ac67bb5864e715ba428904dd683287154cab0f7f9536d7e4c23e3410c5cc024a5839b - languageName: node - linkType: hard - "is-path-inside@npm:^3.0.1": version: 3.0.2 resolution: "is-path-inside@npm:3.0.2" @@ -20191,7 +20129,6 @@ __metadata: "@babel/preset-env": ^7.10.0 "@babel/preset-react": ^7.10.0 "@babel/runtime": ^7.10.0 - "@ibma/aat": "https://able.ibm.com/tools/dist/ibma-aat-2.0.6.tgz" accessibility-checker: ^3.1.1 axe-core: ^3.3.2 babel-jest: ^26.0.1 @@ -25948,7 +25885,7 @@ __metadata: languageName: node linkType: hard -"path-is-inside@npm:^1.0.1, path-is-inside@npm:^1.0.2": +"path-is-inside@npm:^1.0.1": version: 1.0.2 resolution: "path-is-inside@npm:1.0.2" checksum: 9c1841199d18398ee5f6d79f57eaa57f8eb85743353ea97c6d933423f246f044575a10c1847c638c36440b050aef82665b9cb4fc60950866cd239f3d51835ef4 @@ -27633,22 +27570,6 @@ __metadata: languageName: node linkType: hard -"puppeteer@npm:^2.0.0": - version: 2.0.0 - resolution: "puppeteer@npm:2.0.0" - dependencies: - debug: ^4.1.0 - extract-zip: ^1.6.6 - https-proxy-agent: ^3.0.0 - mime: ^2.0.3 - progress: ^2.0.1 - proxy-from-env: ^1.0.0 - rimraf: ^2.6.1 - ws: ^6.1.0 - checksum: b3fef727c22c62f34e52492da75aa3a3627084617f5015eb33f7aa2f0e50c352b9c554deb42ebbc235540cd5561095effa6be26fcebb125cdca9ef6164a37912 - languageName: node - linkType: hard - "puppeteer@npm:^5.3.0": version: 5.4.1 resolution: "puppeteer@npm:5.4.1"