chore: better test structure / name conistency (dequelabs#738)

* chore: better test structure / name conistency * more descriptive describe * finish * remove examples * rename file
mrtnvh · Jun 1, 2023 · 3d06f08 · 3d06f08
1 parent fe3721d
commit 3d06f08
Show file tree

Hide file tree

Showing 20 changed files with 17 additions and 17 deletions.
diff --git a/packages/playwright/package.json b/packages/playwright/package.json
@@ -42,8 +42,8 @@
   "scripts": {
     "prebuild": "rimraf dist",
     "build": "tsup src/index.ts --dts --format esm,cjs",
-    "test": "mocha --timeout 60000 -r ts-node/register 'tests/**.spec.ts'",
-    "test:esm": "node esmTest.mjs",
+    "test": "mocha --timeout 60000 -r ts-node/register 'test/**.spec.ts'",
+    "test:esm": "node test/esmTest.mjs",
     "coverage": "nyc npm run test",
     "prepare": "npm run build"
   },

diff --git a/...s/playwright/tests/axe-playwright.spec.ts → ...es/playwright/test/axe-playwright.spec.ts b/...s/playwright/tests/axe-playwright.spec.ts → ...es/playwright/test/axe-playwright.spec.ts
diff --git a/packages/playwright/esmTest.mjs → packages/playwright/test/esmTest.mjs b/packages/playwright/esmTest.mjs → packages/playwright/test/esmTest.mjs
@@ -1,4 +1,4 @@
-import defaultExport from './dist/index.mjs';
+import defaultExport from '../dist/index.mjs';
 import assert from 'assert';
 
 const exportIsFunction = typeof(defaultExport) === 'function';

diff --git a/...es/playwright/tests/fixtures/context.html → ...ges/playwright/test/fixtures/context.html b/...es/playwright/tests/fixtures/context.html → ...ges/playwright/test/fixtures/context.html
diff --git a/packages/playwright/tests/fixtures/external → packages/playwright/test/fixtures/external b/packages/playwright/tests/fixtures/external → packages/playwright/test/fixtures/external
diff --git a/packages/puppeteer/package.json b/packages/puppeteer/package.json
@@ -24,8 +24,8 @@
   },
   "scripts": {
     "build": "tsup src/index.ts --dts --format esm,cjs",
-    "test": "mocha 'test/**/*.test.ts'",
-    "test:esm": "node esmTest.mjs",
+    "test": "mocha --timeout 60000 -r ts-node/register 'test/**.spec.ts'",
+    "test:esm": "node test/esmTest.mjs",
     "coverage": "nyc npm run test",
     "prepublishOnly": "npm run build"
   },

diff --git a/packages/puppeteer/test/axePuppeteer.test.ts → ...ages/puppeteer/test/axe-puppeteer.spec.ts b/packages/puppeteer/test/axePuppeteer.test.ts → ...ages/puppeteer/test/axe-puppeteer.spec.ts
diff --git a/packages/puppeteer/esmTest.mjs → packages/puppeteer/test/esmTest.mjs b/packages/puppeteer/esmTest.mjs → packages/puppeteer/test/esmTest.mjs
@@ -1,4 +1,4 @@
-import defaultExport, { AxePuppeteer } from './dist/index.mjs';
+import defaultExport, { AxePuppeteer } from '../dist/index.mjs';
 import assert from 'assert';
 import puppeteer from 'puppeteer';
 import { fileURLToPath, pathToFileURL } from 'url';
@@ -20,7 +20,7 @@ if (process.env.CI) {
 
 async function integrationTest() {
   let path = fileURLToPath(new URL('.', import.meta.url));
-  path = join(path, './node_modules/axe-test-fixtures/fixtures/index.html');
+  path = join(path, '../node_modules/axe-test-fixtures/fixtures/index.html');
 
   const browser = await puppeteer.launch(options);
   const page = await browser.newPage();

diff --git a/...eteer/test/integration/doc-dylang.test.ts → ...eteer/test/integration/doc-dylang.spec.ts b/...eteer/test/integration/doc-dylang.test.ts → ...eteer/test/integration/doc-dylang.spec.ts
diff --git a/packages/puppeteer/test/load-page.test.ts → packages/puppeteer/test/load-page.spec.ts b/packages/puppeteer/test/load-page.test.ts → packages/puppeteer/test/load-page.spec.ts
diff --git a/packages/webdriverio/package.json b/packages/webdriverio/package.json
@@ -28,8 +28,8 @@
   "scripts": {
     "prebuild": "rimraf dist",
     "build": "tsup src/index.ts --dts --format esm,cjs",
-    "test": "mocha --timeout 60000 -r ts-node/register 'src/test.ts'",
-    "test:esm": "node esmTest.mjs",
+    "test": "mocha --timeout 60000 -r ts-node/register 'test/**.spec.ts'",
+    "test:esm": "node test/esmTest.mjs",
     "coverage": "nyc npm run test",
     "prepare": "npm run build"
   },

diff --git a/packages/webdriverio/src/test.ts → .../webdriverio/test/axe-webdriverio.spec.ts b/packages/webdriverio/src/test.ts → .../webdriverio/test/axe-webdriverio.spec.ts
@@ -8,8 +8,8 @@ import { Server, createServer } from 'http';
 import net from 'net';
 import fs from 'fs';
 import delay from 'delay';
-import AxeBuilder from '.';
-import { logOrRethrowError } from './utils';
+import AxeBuilder from '../src';
+import { logOrRethrowError } from '../src/utils';
 import type { AxeResults, Result } from 'axe-core';
 import child_process from 'child_process';
 import { ChildProcessWithoutNullStreams } from 'child_process';
@@ -67,7 +67,7 @@ describe('@axe-core/webdriverio', () => {
       });
     }
 
-    describe('WebdriverIO Async', () => {
+    describe(`WebdriverIO Async (${protocol} protocol)`, () => {
       let server: Server;
       let addr: string;
       let client: webdriverio.Browser;

diff --git a/packages/webdriverio/esmTest.mjs → packages/webdriverio/test/esmTest.mjs b/packages/webdriverio/esmTest.mjs → packages/webdriverio/test/esmTest.mjs
@@ -1,4 +1,4 @@
-import defaultExport from './dist/index.mjs';
+import defaultExport from '../dist/index.mjs';
 import assert from 'assert';
 import * as webdriverio from 'webdriverio';
 import { fileURLToPath, pathToFileURL } from 'url';
@@ -10,7 +10,7 @@ assert(exportIsFunction, 'export is not a function');
 
 async function integrationTest() {
   let path = fileURLToPath(new URL('.', import.meta.url));
-  path = join(path, './node_modules/axe-test-fixtures/fixtures/index.html');
+  path = join(path, '../node_modules/axe-test-fixtures/fixtures/index.html');
 
   const options = {
     automationProtocol: 'devtools',

diff --git a/packages/webdriverjs/package.json b/packages/webdriverjs/package.json
@@ -48,8 +48,8 @@
   "scripts": {
     "prebuild": "rimraf dist",
     "build": "tsup src/index.ts --dts --format esm,cjs",
-    "test": "mocha --timeout 10000 -r ts-node/register './tests/**/*.spec.ts'",
-    "test:esm": "node esmTest.mjs",
+    "test": "mocha --timeout 60000 -r ts-node/register 'test/**.spec.ts'",
+    "test:esm": "node test/esmTest.mjs",
     "coverage": "nyc npm run test",
     "prepare": "npm run build"
   },

diff --git a/...webdriverjs/tests/axe-webdriverjs.spec.ts → .../webdriverjs/test/axe-webdriverjs.spec.ts b/...webdriverjs/tests/axe-webdriverjs.spec.ts → .../webdriverjs/test/axe-webdriverjs.spec.ts
diff --git a/packages/webdriverjs/esmTest.mjs → packages/webdriverjs/test/esmTest.mjs b/packages/webdriverjs/esmTest.mjs → packages/webdriverjs/test/esmTest.mjs
@@ -1,4 +1,4 @@
-import defaultExport from './dist/index.mjs';
+import defaultExport from '../dist/index.mjs';
 import assert from 'assert';
 
 const exportIsFunction = typeof(defaultExport) === 'function';

diff --git a/...s/webdriverjs/tests/fixtures/context.html → ...es/webdriverjs/test/fixtures/context.html b/...s/webdriverjs/tests/fixtures/context.html → ...es/webdriverjs/test/fixtures/context.html
diff --git a/packages/webdriverjs/tests/fixtures/external → packages/webdriverjs/test/fixtures/external b/packages/webdriverjs/tests/fixtures/external → packages/webdriverjs/test/fixtures/external
diff --git a/...ebdriverjs/tests/fixtures/iframe-one.html → ...webdriverjs/test/fixtures/iframe-one.html b/...ebdriverjs/tests/fixtures/iframe-one.html → ...webdriverjs/test/fixtures/iframe-one.html
diff --git a/packages/webdriverjs/tests/test-utils.ts → packages/webdriverjs/test/test-utils.ts b/packages/webdriverjs/tests/test-utils.ts → packages/webdriverjs/test/test-utils.ts