test: run unit tests and e2e tests in 1 single command yarn test (#1180)

Author: ahnpnl

.github/workflows/ci.yml

@@ -73,9 +73,7 @@ jobs:
           cache: yarn
       - name: Install and build
         run: yarn --immutable
-      - name: Run unit tests
-        run: yarn test-unit
-      - name: Run e2e tests
-        run: yarn test-e2e
+      - name: Run tests
+        run: yarn test
       - name: Run tests in example projects
         run: yarn test-examples

e2e/__tests__/ast-transformers.test.ts

@@ -1,33 +1,23 @@
 import { jsonNoCache as runWithJsonNoCache } from '../run-jest';
 
-describe('hoisting', () => {
-  const DIR = 'ast-transformers/hoisting';
-
-  test(`successfully runs the tests inside ${DIR} with isolatedModules: false`, () => {
-    const { json } = runWithJsonNoCache(DIR);
+const executeTest = (dirName: string): void => {
+  test(`successfully runs the tests inside ${dirName} with isolatedModules: false`, () => {
+    const { json } = runWithJsonNoCache(dirName);
 
     expect(json.success).toBe(true);
   });
 
-  test(`successfully runs the tests inside ${DIR} with isolatedModules: true`, () => {
-    const { json } = runWithJsonNoCache(DIR, ['-c=jest-isolated.config.js']);
+  test(`successfully runs the tests inside ${dirName} with isolatedModules: true`, () => {
+    const { json } = runWithJsonNoCache(dirName, ['-c=jest-isolated.config.js']);
 
     expect(json.success).toBe(true);
   });
+};
+
+describe('hoisting', () => {
+  executeTest('ast-transformers/hoisting');
 });
 
 describe('ng-jit-transformers', () => {
-  const DIR = 'ast-transformers/ng-jit-transformers';
-
-  test(`successfully runs the tests inside ${DIR} with isolatedModules: false`, () => {
-    const { json } = runWithJsonNoCache(DIR);
-
-    expect(json.success).toBe(true);
-  });
-
-  test(`successfully runs the tests inside ${DIR} with isolatedModules: true`, () => {
-    const { json } = runWithJsonNoCache(DIR, ['-c=jest-isolated.config.js']);
-
-    expect(json.success).toBe(true);
-  });
+  executeTest('ast-transformers/ng-jit-transformers');
 });

e2e/__tests__/async.test.ts

@@ -3,19 +3,19 @@ import path from 'path';
 import { jsonNoCache as runWithJsonNoCache } from '../run-jest';
 import { runYarnInstall } from '../utils';
 
-const DIR = path.join(__dirname, '..', 'async');
+const DIR = 'async';
 
 beforeAll(() => {
-  runYarnInstall(DIR);
+  runYarnInstall(path.join(__dirname, '..', DIR));
 });
 
-test(`successfully runs the tests inside ${DIR} with isolatedModules: false`, () => {
+test(`successfully run the tests inside ${DIR} with isolatedModules: false`, () => {
   const { json } = runWithJsonNoCache(DIR);
 
   expect(json.success).toBe(true);
 });
 
-test(`successfully runs the tests inside ${DIR} with isolatedModules: true`, () => {
+test(`successfully run the tests inside ${DIR} with isolatedModules: true`, () => {
   const { json } = runWithJsonNoCache(DIR, ['-c=jest-isolated.config.js']);
 
   expect(json.success).toBe(true);

e2e/__tests__/babel-support.test.ts

@@ -3,19 +3,19 @@ import path from 'path';
 import { jsonNoCache as runWithJsonNoCache } from '../run-jest';
 import { runYarnInstall } from '../utils';
 
-const DIR = path.join(__dirname, '..', 'babel-support');
+const DIR = 'babel-support';
 
 beforeAll(() => {
-  runYarnInstall(DIR);
+  runYarnInstall(path.join(__dirname, '..', DIR));
 });
 
-test(`successfully runs the tests inside ${DIR} with isolatedModules: false`, () => {
+test(`successfully run the tests inside ${DIR} with isolatedModules: false`, () => {
   const { json } = runWithJsonNoCache(DIR);
 
   expect(json.success).toBe(true);
 });
 
-test(`successfully runs the tests inside ${DIR} with isolatedModules: true`, () => {
+test(`successfully run the tests inside ${DIR} with isolatedModules: true`, () => {
   const { json } = runWithJsonNoCache(DIR, ['-c=jest-isolated.config.js']);
 
   expect(json.success).toBe(true);

e2e/__tests__/custom-typings.test.ts

@@ -3,19 +3,19 @@ import path from 'path';
 import { jsonNoCache as runWithJsonNoCache } from '../run-jest';
 import { runYarnInstall } from '../utils';
 
-const DIR = path.join(__dirname, '..', 'custom-typings');
+const DIR = 'custom-typings';
 
 beforeAll(() => {
-  runYarnInstall(DIR);
+  runYarnInstall(path.join(__dirname, '..', DIR));
 });
 
-test(`successfully runs the tests inside ${DIR} with isolatedModules: false`, () => {
+test(`successfully run the tests inside ${DIR} with isolatedModules: false`, () => {
   const { json } = runWithJsonNoCache(DIR);
 
   expect(json.success).toBe(true);
 });
 
-test(`successfully runs the tests inside ${DIR} with isolatedModules: true`, () => {
+test(`successfully run the tests inside ${DIR} with isolatedModules: true`, () => {
   const { json } = runWithJsonNoCache(DIR, ['-c=jest-isolated.config.js']);
 
   expect(json.success).toBe(true);

e2e/__tests__/jest-globals.test.ts

@@ -1,7 +1,14 @@
+import path from 'path';
+
 import { jsonNoCache as runWithJsonNoCache } from '../run-jest';
+import { runYarnInstall } from '../utils';
 
 const DIR = 'jest-globals';
 
+beforeAll(() => {
+  runYarnInstall(path.join(__dirname, '..', DIR));
+});
+
 test(`successfully runs the tests inside ${DIR} with isolatedModules: false`, () => {
   const { json } = runWithJsonNoCache(DIR);