(refactor): rename tests -> e2e, integration-tests -> integration

- change testDir in tests to the new names
- reword docs and scripts so they handle this properly

(refactor): interpolate directory in the lint tests
- DRY up so don't have to change all these lines when the path is
  a constant

package.json

@@ -24,7 +24,7 @@
     "prepare": "tsc -p tsconfig.json",
     "build": "tsc -p tsconfig.json",
     "lint": "yarn build && yarn lint:post-build",
-    "lint:post-build": "node dist/index.js lint src test --ignore-pattern 'test/tests/lint'",
+    "lint:post-build": "node dist/index.js lint src test --ignore-pattern 'test/e2e/lint'",
     "test": "yarn build && yarn test:post-build",
     "test:post-build": "node dist/index.js test",
     "start": "tsc -p tsconfig.json --watch",

test/README.md

@@ -2,5 +2,5 @@
 
 There are two main directories here:
 
-- `tests` contains end-to-end (E2E) tests of the CLI
-- `integration-tests` contains tests ensuring that common or recommended plugins work properly together with TSDX
+- `e2e` contains end-to-end (E2E) tests of the CLI
+- `integration` contains tests ensuring that common or recommended plugins work properly together with TSDX

test/tests/lint/tsdx-lint.test.js → test/e2e/lint/tsdx-lint.test.js

@@ -8,39 +8,41 @@ const util = require('../../utils/fixture');
 
 shell.config.silent = true;
 
-const testDir = 'tests';
+const testDir = 'e2e';
 const stageName = 'stage-lint';
 
+const lintDir = `test/${testDir}/lint`
+
 describe('tsdx lint', () => {
   it('should fail to lint a ts file with errors', () => {
-    const testFile = 'test/tests/lint/file-with-lint-errors.ts';
+    const testFile = `${lintDir}/file-with-lint-errors.ts`;
     const output = shell.exec(`node dist/index.js lint ${testFile}`);
     expect(output.code).toBe(1);
     expect(output.stdout.includes('Parsing error:')).toBe(true);
   });
 
   it('should succeed linting a ts file without errors', () => {
-    const testFile = 'test/tests/lint/file-without-lint-error.ts';
+    const testFile = `${lintDir}/file-without-lint-error.ts`;
     const output = shell.exec(`node dist/index.js lint ${testFile}`);
     expect(output.code).toBe(0);
   });
 
   it('should fail to lint a ts file with prettier errors', () => {
-    const testFile = 'test/tests/lint/file-with-prettier-lint-errors.ts';
+    const testFile = `${lintDir}/file-with-prettier-lint-errors.ts`;
     const output = shell.exec(`node dist/index.js lint ${testFile}`);
     expect(output.code).toBe(1);
     expect(output.stdout.includes('prettier/prettier')).toBe(true);
   });
 
   it('should fail to lint a tsx file with errors', () => {
-    const testFile = 'test/tests/lint/react-file-with-lint-errors.tsx';
+    const testFile = `${lintDir}/react-file-with-lint-errors.tsx`;
     const output = shell.exec(`node dist/index.js lint ${testFile}`);
     expect(output.code).toBe(1);
     expect(output.stdout.includes('Parsing error:')).toBe(true);
   });
 
   it('should succeed linting a tsx file without errors', () => {
-    const testFile = 'test/tests/lint/react-file-without-lint-error.tsx';
+    const testFile = `${lintDir}/react-file-without-lint-error.tsx`;
     const output = shell.exec(`node dist/index.js lint ${testFile}`);
     expect(output.code).toBe(0);
   });

test/tests/tsdx-build-default.test.js → test/e2e/tsdx-build-default.test.js

@@ -4,7 +4,7 @@ const { execWithCache } = require('../utils/shell');
 
 shell.config.silent = false;
 
-const testDir = 'tests';
+const testDir = 'e2e';
 const fixtureName = 'build-default';
 const stageName = `stage-${fixtureName}`;
 

test/tests/tsdx-build-invalid.test.js → test/e2e/tsdx-build-invalid.test.js

@@ -4,7 +4,7 @@ const { execWithCache } = require('../utils/shell');
 
 shell.config.silent = false;
 
-const testDir = 'tests';
+const testDir = 'e2e';
 const fixtureName = 'build-invalid';
 const stageName = `stage-${fixtureName}`;
 

test/tests/tsdx-build-withTsconfig.test.js → test/e2e/tsdx-build-withTsconfig.test.js

@@ -4,7 +4,7 @@ const { execWithCache } = require('../utils/shell');
 
 shell.config.silent = false;
 
-const testDir = 'tests';
+const testDir = 'e2e';
 const fixtureName = 'build-withTsconfig';
 const stageName = `stage-${fixtureName}`;
 

test/integration-tests/tsdx-build-options.test.js → test/integration/tsdx-build-options.test.js

@@ -5,7 +5,7 @@ const { execWithCache } = require('../utils/shell');
 
 shell.config.silent = false;
 
-const testDir = 'integration-tests';
+const testDir = 'integration';
 const fixtureName = 'build-options';
 const stageName = `stage-integration-${fixtureName}`;
 

test/integration-tests/tsdx-build-withConfig.test.js → test/integration/tsdx-build-withConfig.test.js

@@ -6,7 +6,7 @@ const { execWithCache } = require('../utils/shell');
 
 shell.config.silent = false;
 
-const testDir = 'integration-tests';
+const testDir = 'integration';
 const fixtureName = 'build-withConfig';
 const stageName = `stage-integration-${fixtureName}`;