From 24711ca16c58c9d2e4391d012585c4f280fb0c43 Mon Sep 17 00:00:00 2001 From: Tim Deschryver <28659384+timdeschryver@users.noreply.github.com> Date: Mon, 1 Apr 2019 20:27:59 +0200 Subject: [PATCH] chore(example): update jest dependencies and configuration (#1680) Closes #1674 --- .circleci/config.yml | 2 +- package.json | 8 +- projects/example-app/jest.config.js | 21 +- .../login-form.component.spec.ts.snap | 100 +- ...confirmation-dialog.component.spec.ts.snap | 5 - .../login-page.component.spec.ts.snap | 39 +- .../collection-page.component.spec.ts.snap | 4 - .../find-book-page.component.spec.ts.snap | 21 +- .../selected-book-page.component.spec.ts.snap | 1 - .../view-book-page.component.spec.ts.snap | 4 +- projects/example-app/tsconfig.spec.json | 18 +- yarn.lock | 1934 ++++++++++++----- 12 files changed, 1433 insertions(+), 724 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c6c633536e..45462bef57 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -97,7 +97,7 @@ jobs: - checkout - restore_cache: key: *cache_key - - run: yarn run example:test --watch=false + - run: yarn run example:test --watch=false --runInBand example-e2e-tests: <<: *run_in_browser diff --git a/package.json b/package.json index 7e0222d84c..ce285544d2 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "@types/globby": "^8.0.0", "@types/jasmine": "2.5.45", "@types/jasminewd2": "^2.0.2", - "@types/jest": "^20.0.2", + "@types/jest": "^24.0.11", "@types/lodash": "^4.14.80", "@types/ncp": "^2.0.1", "@types/node": "^7.0.5", @@ -134,9 +134,9 @@ "jasmine-core": "~2.5.2", "jasmine-marbles": "^0.4.0", "jasmine-spec-reporter": "~3.2.0", - "jest": "^21.0.2", - "jest-preset-angular": "^3.0.1", - "jest-zone-patch": "^0.0.7", + "jest": "^24.5.0", + "jest-preset-angular": "^7.0.1", + "jest-zone-patch": "^0.0.10", "karma": "~1.4.1", "karma-chrome-launcher": "~2.0.0", "karma-cli": "~1.0.1", diff --git a/projects/example-app/jest.config.js b/projects/example-app/jest.config.js index 59a219bd05..9e0b686148 100644 --- a/projects/example-app/jest.config.js +++ b/projects/example-app/jest.config.js @@ -1,19 +1,21 @@ module.exports = { rootDir: '.', - setupTestFrameworkScriptFile: '/src/setup-jest.ts', + setupFilesAfterEnv: ['/src/setup-jest.ts'], globals: { 'ts-jest': { - tsConfigFile: 'projects/example-app/tsconfig.spec.json', + tsConfig: 'projects/example-app/tsconfig.spec.json', + stringifyContentPathRegex: '\\.html?$', + astTransformers: [ + require.resolve('jest-preset-angular/InlineHtmlStripStylesTransformer'), + ], }, - __TRANSFORM_HTML__: true, }, transform: { - '^.+\\.(ts|js|html)$': - '/../../node_modules/jest-preset-angular/preprocessor.js', + '^.+\\.(ts|js|html)$': 'ts-jest', }, testMatch: ['/**/*.spec.ts'], - moduleFileExtensions: ['ts', 'js', 'html', 'json'], - mapCoverage: true, + testEnvironment: 'jest-environment-jsdom-thirteen', + moduleFileExtensions: ['html', 'js', 'json', 'ts'], coveragePathIgnorePatterns: ['/node_modules/', '/modules/*.*/'], moduleNameMapper: { '^@ngrx/(.*)': '/../../modules/$1', @@ -21,4 +23,9 @@ module.exports = { }, transformIgnorePatterns: ['node_modules/(?!@ngrx)'], modulePathIgnorePatterns: ['dist'], + preset: 'jest-preset-angular', + snapshotSerializers: [ + 'jest-preset-angular/AngularSnapshotSerializer.js', + 'jest-preset-angular/HTMLCommentSerializer.js', + ], }; diff --git a/projects/example-app/src/app/auth/components/__snapshots__/login-form.component.spec.ts.snap b/projects/example-app/src/app/auth/components/__snapshots__/login-form.component.spec.ts.snap index 72759195aa..707f27a851 100644 --- a/projects/example-app/src/app/auth/components/__snapshots__/login-form.component.spec.ts.snap +++ b/projects/example-app/src/app/auth/components/__snapshots__/login-form.component.spec.ts.snap @@ -5,31 +5,19 @@ exports[`Login Page should compile 1`] = ` form={[Function FormGroup]} submitted={[Function EventEmitter]} > - - + + Login - +
-

- +

+

-

- +

+