Skip to content

Commit d67ac1f

Browse files
authored
build: update to jasmine 6 (#32694)
Updates the repo to Jasmine 6 and resolves a breakage due to `karma-jasmine-html-reporter` not supporting it yet. I ended up removing the reporter since we run the tests through Bazel which wasn't showing the specific debug page anyways.
1 parent 784d22d commit d67ac1f

9 files changed

Lines changed: 50 additions & 46 deletions

File tree

docs/defs.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ TEST_DEPS = [
4545
"//docs:node_modules/karma-coverage",
4646
"//docs:node_modules/karma-firefox-launcher",
4747
"//docs:node_modules/karma-jasmine",
48-
"//docs:node_modules/karma-jasmine-html-reporter",
4948
]
5049

5150
# Common dependencies of Angular CLI test suites

docs/karma.conf.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ module.exports = function (config) {
1616
require('karma-jasmine'),
1717
require('karma-chrome-launcher'),
1818
require('karma-firefox-launcher'),
19-
require('karma-jasmine-html-reporter'),
2019
require('@angular-devkit/build-angular/plugins/karma'),
2120
],
2221
client: {
@@ -27,7 +26,7 @@ module.exports = function (config) {
2726
reports: ['html', 'lcovonly', 'text-summary'],
2827
fixWebpackSourcePaths: true,
2928
},
30-
reporters: ['progress', 'kjhtml'],
29+
reporters: ['progress'],
3130
port: 9876,
3231
colors: true,
3332
logLevel: config.LOG_INFO,

docs/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,17 @@
5858
"@angular/cli": "catalog:",
5959
"@angular/compiler-cli": "catalog:",
6060
"@bazel/bazelisk": "^1.12.1",
61-
"@types/jasmine": "5.1.15",
61+
"@types/jasmine": "^6.0.0",
6262
"@types/node": "^22.14.1",
6363
"@types/shelljs": "0.10.0",
6464
"firebase-tools": "15.2.1",
65-
"jasmine-core": "5.13.0",
65+
"jasmine-core": "^6.0.0",
6666
"jasmine-spec-reporter": "7.0.0",
6767
"karma": "~6.4.4",
6868
"karma-chrome-launcher": "^3.1.1",
6969
"karma-coverage": "~2.2.0",
7070
"karma-firefox-launcher": "^2.1.0",
7171
"karma-jasmine": "^5.0.0",
72-
"karma-jasmine-html-reporter": "^2.0.0",
7372
"light-server": "^2.9.1",
7473
"lighthouse": "^13.0.0",
7574
"lighthouse-logger": "~2.0.0",

docs/scenes/karma.conf.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ module.exports = function (config) {
2020
require('karma-jasmine'),
2121
require('karma-chrome-launcher'),
2222
require('karma-firefox-launcher'),
23-
require('karma-jasmine-html-reporter'),
2423
require('@angular-devkit/build-angular/plugins/karma'),
2524
],
2625
client: {
@@ -31,7 +30,7 @@ module.exports = function (config) {
3130
reports: ['html', 'lcovonly', 'text-summary'],
3231
fixWebpackSourcePaths: true,
3332
},
34-
reporters: ['progress', 'kjhtml'],
33+
reporters: ['progress'],
3534
port: 9876,
3635
colors: true,
3736
logLevel: config.LOG_INFO,

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"@schematics/angular": "catalog:",
9393
"@types/babel__core": "^7.1.18",
9494
"@types/fs-extra": "^11.0.0",
95-
"@types/jasmine": "^5.0.0",
95+
"@types/jasmine": "^6.0.0",
9696
"@types/luxon": "^3.0.0",
9797
"@types/node": "^22.14.1",
9898
"@types/selenium-webdriver": "^3.0.17",
@@ -110,8 +110,8 @@
110110
"glob": "^13.0.0",
111111
"highlight.js": "^11.0.0",
112112
"husky": "^9.0.1",
113-
"jasmine": "^5.6.0",
114-
"jasmine-core": "5.13.0",
113+
"jasmine": "^6.0.0",
114+
"jasmine-core": "^6.0.0",
115115
"jasmine-reporters": "^2.5.2",
116116
"jsonc-parser": "^3.3.1",
117117
"kagekiri": "^2.0.0",

pnpm-lock.yaml

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

src/material/core/theming/tests/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,4 @@ jasmine_test(
8888
"//src/material:sass_lib",
8989
"//src/material-experimental:sass_lib",
9090
],
91-
shard_count = 4,
9291
)

src/material/schematics/ng-generate/theme-color/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,4 @@ jasmine_test(
9696
"//src/material:sass_lib",
9797
"//src/material-experimental:sass_lib",
9898
],
99-
shard_count = 10,
10099
)

src/material/schematics/ng-update/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,4 @@ jasmine_test(
6666
"//src/material/schematics:node_modules/@angular/cdk/schematics",
6767
"//src/material/schematics:package_json",
6868
],
69-
shard_count = 4,
7069
)

0 commit comments

Comments
 (0)