test(e2e): pure jest configuration #610

help-me-mom · Jul 25, 2021 · a833c40 · a833c40
1 parent a7f9882
commit a833c40
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 19 deletions.
diff --git a/e2e/a-jest/jest.es2015ivy.js b/e2e/a-jest/jest.es2015ivy.js
@@ -1,6 +1,5 @@
 module.exports = {
   preset: 'jest-preset-angular',
-  testRunner: 'jest-jasmine2',
   setupFilesAfterEnv: ['<rootDir>/src/setup-jest.ts'],
   testURL: 'http://localhost',
   testPathIgnorePatterns: ['<rootDir>/src/test.ts'],

diff --git a/e2e/a-jest/jest.es5ivy.js b/e2e/a-jest/jest.es5ivy.js
@@ -1,6 +1,5 @@
 module.exports = {
   preset: 'jest-preset-angular',
-  testRunner: 'jest-jasmine2',
   setupFilesAfterEnv: ['<rootDir>/src/setup-jest.ts'],
   testURL: 'http://localhost',
   testPathIgnorePatterns: ['<rootDir>/src/test.ts'],

diff --git a/e2e/a-jest/package-lock.json b/e2e/a-jest/package-lock.json
diff --git a/e2e/a-jest/package.json b/e2e/a-jest/package.json
@@ -32,7 +32,6 @@
     "@angular-devkit/build-angular": "12.1.3",
     "@angular/cli": "12.1.3",
     "@angular/compiler-cli": "12.1.3",
-    "@types/jasmine": "3.8.1",
     "@types/jest": "26.0.24",
     "@types/node": "14.17.6",
     "jest": "27.0.6",

diff --git a/e2e/a-jest/src/app/app.component.spec.ts b/e2e/a-jest/src/app/app.component.spec.ts
@@ -14,6 +14,10 @@ ngMocks.defaultMock(AppService, () => ({
 }));
 
 describe('app-component', () => {
+  // A fix until https://github.com/facebook/jest/issues/11483 has been merged.
+  MockInstance.scope('all');
+  MockInstance.scope();
+
   const factory = MockRenderFactory(AppComponent, ['scope']);
   ngMocks.faster();
   beforeAll(() => MockBuilder(AppComponent, AppModule));

diff --git a/e2e/a-jest/src/setup-jest.ts b/e2e/a-jest/src/setup-jest.ts
@@ -3,10 +3,3 @@ import 'jest-preset-angular/setup-jest';
 import { MockInstance, ngMocks } from 'ng-mocks';
 
 ngMocks.autoSpy('jest');
-
-jasmine.getEnv().addReporter({
-  specDone: MockInstance.restore,
-  specStarted: MockInstance.remember,
-  suiteDone: MockInstance.restore,
-  suiteStarted: MockInstance.remember,
-});
diff --git a/e2e/a-jest/tsconfig.json b/e2e/a-jest/tsconfig.json
@@ -18,7 +18,7 @@
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
-    "types": ["jasmine", "jest", "node"]
+    "types": ["jest", "node"]
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,

diff --git a/e2e/a-min/jest.es2015ivy.js b/e2e/a-min/jest.es2015ivy.js
@@ -1,6 +1,5 @@
 module.exports = {
   preset: 'jest-preset-angular',
-  testRunner: 'jest-jasmine2',
   setupFilesAfterEnv: ['<rootDir>/src/setup-jest.ts'],
   testURL: 'http://localhost',
   testPathIgnorePatterns: ['<rootDir>/src/test.ts'],

diff --git a/e2e/a-min/jest.es5ivy.js b/e2e/a-min/jest.es5ivy.js
@@ -1,6 +1,5 @@
 module.exports = {
   preset: 'jest-preset-angular',
-  testRunner: 'jest-jasmine2',
   setupFilesAfterEnv: ['<rootDir>/src/setup-jest.ts'],
   testURL: 'http://localhost',
   testPathIgnorePatterns: ['<rootDir>/src/test.ts'],