Skip to content

Commit

Permalink
Fix running angular tests on CI (DevExpress#28387)
Browse files Browse the repository at this point in the history
  • Loading branch information
GoodDayForSurf authored Nov 22, 2024
1 parent 75e3416 commit 41477d6
Show file tree
Hide file tree
Showing 8 changed files with 238 additions and 339 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ node_modules
.DS_Store
Thumbs.db

.cache
.nx/cache
.nx/workspace-data
nx-cloud.env
4 changes: 2 additions & 2 deletions apps/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
"devextreme-angular": "workspace:~",
"rxjs": "7.8.1",
"tslib": "^2.6.1",
"zone.js": "0.13.3"
"zone.js": "0.14.10"
},
"devDependencies": {
"@angular-devkit/build-angular": "17.3.8",
"@angular/cli": "17.3.8",
"@angular/cli": "17.3.11",
"@angular/language-service": "17.3.12",
"@angular/platform-server": "17.3.12",
"@types/jasmine": "5.1.4",
Expand Down
2 changes: 1 addition & 1 deletion apps/angular/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
/***************************************************************************************************
* Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.
import 'zone.js'; // Included with Angular CLI.


/***************************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion apps/demos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"devextreme-vue": "workspace:~"
},
"dependencies": {
"@angular/cli": "17.3.8",
"@angular/cli": "17.3.11",
"@angular/common": "17.3.12",
"@angular/compiler": "17.3.12",
"@angular/compiler-cli": "17.3.12",
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-angular/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ const getKarmaConfig = function (testsPath) {
return karmaConfig.parseConfig(path.resolve('./karma.conf.js'), {
files: [{ pattern: testsPath, watched: false }],
preprocessors,
});
}, {throwErrors: true});
};

gulp.task('test.components.client', gulp.series('build.tests', (done) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-angular/karma.test.shim.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ testing.TestBed.initTestEnvironment(
browser.platformBrowserDynamicTesting(),
);

const context = require.context('./tests/dist', true, /^.\/(?!.*\/ssr-.*\.spec.js$).*\.spec\.js$/);
const context = require.context('./tests/dist', true, /^.\/(?!.*\/ssr-components\.spec.js$).*\.spec\.js$/);
context.keys().map(context);
__karma__.start();
8 changes: 4 additions & 4 deletions packages/devextreme-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
"devextreme": "workspace:~"
},
"devDependencies": {
"@angular-devkit/architect": "0.1703.8",
"@angular-devkit/schematics": "17.3.8",
"@angular-devkit/architect": "0.1703.11",
"@angular-devkit/schematics": "17.3.11",
"@angular/animations": "17.3.12",
"@angular/cli": "17.3.8",
"@angular/cli": "17.3.11",
"@angular/common": "17.3.12",
"@angular/compiler": "17.3.12",
"@angular/compiler-cli": "17.3.12",
Expand Down Expand Up @@ -56,7 +56,7 @@
"karma-junit-reporter": "^2.0.1",
"karma-webpack": "5.0.1",
"ng-packagr": "17.3.0",
"puppeteer": "~23.1.1",
"puppeteer": "~23.6.1",
"reflect-metadata": "0.1.13",
"rxjs": "7.8.1",
"stream-browserify": "3.0.0",
Expand Down
556 changes: 227 additions & 329 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

0 comments on commit 41477d6

Please sign in to comment.