Skip to content

Commit 2e81a1e

Browse files
authored
Merge pull request #4809 from satanTime/issues/e2e
build: latest updates
2 parents 3e9654f + 989cac9 commit 2e81a1e

17 files changed

Lines changed: 15650 additions & 14682 deletions

docs/package-lock.json

Lines changed: 1203 additions & 1198 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/a14/package-lock.json

Lines changed: 1026 additions & 742 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
module.exports = {
1+
export default {
22
preset: 'jest-preset-angular',
33
setupFilesAfterEnv: ['<rootDir>/src/setup-jest.ts'],
44
testEnvironmentOptions: {
55
url: 'http://localhost',
66
},
77
testPathIgnorePatterns: ['<rootDir>/src/test.ts'],
88
transform: {
9-
'\\.tsx?$': ['jest-preset-angular', { tsconfig: './tsconfig.json' }],
9+
'^.+\\.(ts|mjs|js|html)$': ['jest-preset-angular', { tsconfig: './tsconfig.json' }],
1010
},
1111
};

e2e/a15/package-lock.json

Lines changed: 1311 additions & 723 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/a15/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"test:debug": "npm run test:jasmine -- --browsers=Chrome --watch",
1313
"test:jasmine": "ng test --ts-config ./tsconfig.json --progress=false",
1414
"test:jasmine:debug": "ng test -- --watch --browsers Chrome",
15-
"test:jest": "jest -i --config jest.js",
15+
"test:jest": "jest -i --config jest.config.ts",
1616
"test:jest:debug": "jest -i --watch"
1717
},
1818
"peerDependencies": {
@@ -46,6 +46,7 @@
4646
"karma-jasmine-html-reporter": "2.0.0",
4747
"ng-packagr": "15.1.1",
4848
"puppeteer": "13.7.0",
49+
"ts-node": "10.9.1",
4950
"typescript": "4.8.4"
5051
},
5152
"engines": {

e2e/a15/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
"strictTemplates": true
3232
},
3333
"files": ["src/main.ts", "src/polyfills.ts", "src/test.ts", "src/setup-jest.ts"],
34-
"include": ["src/**/*.spec.ts", "src/**/*.d.ts"]
34+
"include": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
3535
}

e2e/jasmine/package-lock.json

Lines changed: 1041 additions & 682 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/jest/jest.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ export default {
66
},
77
testPathIgnorePatterns: ['<rootDir>/src/test.ts'],
88
transform: {
9-
'\\.tsx?$': ['jest-preset-angular', { tsconfig: './tsconfig.json' }],
9+
'^.+\\.(ts|mjs|js|html)$': ['jest-preset-angular', { tsconfig: './tsconfig.json' }],
1010
},
1111
};

e2e/jest/package-lock.json

Lines changed: 1034 additions & 673 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/min/jest.config.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ export default {
33
setupFilesAfterEnv: ['<rootDir>/src/setup-jest.ts'],
44
testURL: 'http://localhost',
55
testPathIgnorePatterns: ['<rootDir>/src/test.ts'],
6-
globals: {
7-
'ts-jest': {
8-
tsconfig: 'tsconfig.json',
9-
},
6+
transform: {
7+
'^.+\\.(ts|mjs|js|html)$': ['jest-preset-angular', { tsconfig: './tsconfig.json' }],
108
},
119
};

0 commit comments

Comments
 (0)