Skip to content

Commit bf566c7

Browse files
alan-agius4vikerman
authored andcommitted
build: update karma and jasmine dependencies (#13566)
* feat(@schematics/angular): update karma and jasmine dependencies * feat(@angular-devkit/build-angular): update karma and jasmine dependencies * build: update karma and jasmine dependencies * test: add test expectations in shell component
1 parent 290b68c commit bf566c7

File tree

5 files changed

+47
-55
lines changed

5 files changed

+47
-55
lines changed

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"@types/glob": "^7.0.0",
8383
"@types/inquirer": "^0.0.43",
8484
"@types/istanbul": "^0.4.30",
85-
"@types/jasmine": "^2.8.8",
85+
"@types/jasmine": "^3.3.8",
8686
"@types/loader-utils": "^1.1.3",
8787
"@types/minimist": "^1.2.0",
8888
"@types/node": "8.10.10",
@@ -102,9 +102,10 @@
102102
"husky": "^0.14.3",
103103
"istanbul": "^0.4.5",
104104
"jasmine": "^2.6.0",
105-
"jasmine-spec-reporter": "^3.2.0",
106-
"karma": "~3.1.1",
107-
"karma-jasmine-html-reporter": "^0.2.2",
105+
"jasmine-spec-reporter": "^4.2.1",
106+
"karma": "~4.0.0",
107+
"karma-jasmine": "^2.0.1",
108+
"karma-jasmine-html-reporter": "^1.4.0",
108109
"license-checker": "^20.1.0",
109110
"minimatch": "^3.0.4",
110111
"minimist": "^1.2.0",

packages/angular_devkit/build_angular/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@
7474
"bootstrap": "^4.0.0",
7575
"font-awesome": "^4.7.0",
7676
"jquery": "^3.3.1",
77-
"jasmine-core": "~2.8.0",
77+
"jasmine-core": "~3.3.0",
7878
"jasmine-spec-reporter": "~4.2.1",
79-
"karma": "~3.1.1",
79+
"karma": "~4.0.0",
8080
"karma-chrome-launcher": "~2.2.0",
8181
"karma-coverage-istanbul-reporter": "~2.0.0",
82-
"karma-jasmine": "~1.1.0",
83-
"karma-jasmine-html-reporter": "^0.2.2",
82+
"karma-jasmine": "~2.0.1",
83+
"karma-jasmine-html-reporter": "^1.4.0",
8484
"material-design-icons": "^3.0.1",
8585
"popper.js": "^1.14.1",
8686
"protractor": "~5.4.0",

packages/schematics/angular/app-shell/index_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ describe('App Shell Schematic', () => {
166166

167167
it('should create the shell component', () => {
168168
const tree = schematicRunner.runSchematic('appShell', defaultOptions, appTree);
169-
expect(tree.exists('/projects/bar/src/app/app-shell/app-shell.component.ts'));
169+
expect(tree.exists('/projects/bar/src/app/app-shell/app-shell.component.ts')).toBe(true);
170170
const content = tree.readContent('/projects/bar/src/app/app.server.module.ts');
171171
expect(content).toMatch(/app\-shell\.component/);
172172
});

packages/schematics/angular/workspace/files/package.json.template

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@
2929
"@angular/compiler-cli": "<%= latestVersions.Angular %>",
3030
"@angular/language-service": "<%= latestVersions.Angular %>",
3131
"@types/node": "~8.9.4",<% if (!minimal) { %>
32-
"@types/jasmine": "~2.8.8",
32+
"@types/jasmine": "~3.3.8",
3333
"@types/jasminewd2": "~2.0.3",
3434
"codelyzer": "~4.5.0",
3535
"jasmine-core": "~2.99.1",
3636
"jasmine-spec-reporter": "~4.2.1",
37-
"karma": "~3.1.1",
37+
"karma": "~4.0.0",
3838
"karma-chrome-launcher": "~2.2.0",
3939
"karma-coverage-istanbul-reporter": "~2.0.1",
40-
"karma-jasmine": "~1.1.2",
41-
"karma-jasmine-html-reporter": "^0.2.2",
40+
"karma-jasmine": "~2.0.1",
41+
"karma-jasmine-html-reporter": "^1.4.0",
4242
"protractor": "~5.4.0",<% } %>
4343
"ts-node": "~7.0.0",
4444
"tslint": "~5.11.0",

yarn.lock

Lines changed: 33 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -342,10 +342,10 @@
342342
resolved "https://registry.yarnpkg.com/@types/istanbul/-/istanbul-0.4.30.tgz#073159320ab3296b2cfeb481f756a1f8f4c9c8e4"
343343
integrity sha512-+hQU4fh2G96ze78uI5/V6+SRDZD1UnVrFn23i2eDetwfbBq3s0/zYP92xj/3qyvVMM3WnvS88N56zjz+HmL04A==
344344

345-
"@types/jasmine@^2.8.8":
346-
version "2.8.8"
347-
resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.8.tgz#bf53a7d193ea8b03867a38bfdb4fbb0e0bf066c9"
348-
integrity sha512-OJSUxLaxXsjjhob2DBzqzgrkLmukM3+JMpRp0r0E4HTdT1nwDCWhaswjYxazPij6uOdzHCJfNbDjmQ1/rnNbCg==
345+
"@types/jasmine@^3.3.8":
346+
version "3.3.8"
347+
resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.8.tgz#fc6abd92f7121431685ec986f0ec8f77b4390a3e"
348+
integrity sha512-BaOFpaddRVV8qykJoWHrHtamml880oh0+DIZWbtJgx0pu+KhDF1gER5hSfCIfzyMrbjMuYFnLUfyo1l0JUVU3Q==
349349

350350
"@types/loader-utils@^1.1.3":
351351
version "1.1.3"
@@ -3835,6 +3835,11 @@ find-up@^3.0.0:
38353835
dependencies:
38363836
locate-path "^3.0.0"
38373837

3838+
flatted@^2.0.0:
3839+
version "2.0.0"
3840+
resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
3841+
integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
3842+
38383843
flush-write-stream@^1.0.0:
38393844
version "1.0.3"
38403845
resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
@@ -5364,19 +5369,17 @@ [email protected], jasmine-core@~2.8.0:
53645369
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
53655370
integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
53665371

5372+
jasmine-core@^3.3, jasmine-core@~3.3.0:
5373+
version "3.3.0"
5374+
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e"
5375+
integrity sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA==
5376+
53675377
jasmine-core@~2.99.0:
53685378
version "2.99.1"
53695379
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
53705380
integrity sha1-5kAN8ea1bhMLYcS80JPap/boyhU=
53715381

5372-
jasmine-spec-reporter@^3.2.0:
5373-
version "3.3.0"
5374-
resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-3.3.0.tgz#c63c3d43bacfd16e6da86c46d265957e0075f14c"
5375-
integrity sha1-xjw9Q7rP0W5tqGxG0mWVfgB18Uw=
5376-
dependencies:
5377-
colors "1.1.2"
5378-
5379-
jasmine-spec-reporter@~4.2.1:
5382+
jasmine-spec-reporter@^4.2.1, jasmine-spec-reporter@~4.2.1:
53805383
version "4.2.1"
53815384
resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
53825385
integrity sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==
@@ -5560,22 +5563,22 @@ [email protected]:
55605563
resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz#2c47030452f04531eb7d13d4fc7669630bb93339"
55615564
integrity sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA==
55625565

5563-
karma-jasmine-html-reporter@^0.2.2:
5564-
version "0.2.2"
5565-
resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz#48a8e5ef18807617ee2b5e33c1194c35b439524c"
5566-
integrity sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=
5567-
dependencies:
5568-
karma-jasmine "^1.0.2"
5566+
karma-jasmine-html-reporter@^1.4.0:
5567+
version "1.4.0"
5568+
resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.0.tgz#1abbd30d4509a8c82b96707ae7d2fa4da459ca19"
5569+
integrity sha512-0wxhwA8PLPpICZ4o2GRnPi67hf3JhfQm5WCB8nElh4qsE6wRNOTtrqooyBPNqI087Xr2SBhxLg5fU+BJ/qxRrw==
55695570

55705571
55715572
version "1.1.1"
55725573
resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.1.tgz#6fe840e75a11600c9d91e84b33c458e1c46a3529"
55735574
integrity sha1-b+hA51oRYAydkehLM8RY4cRqNSk=
55745575

5575-
karma-jasmine@^1.0.2, karma-jasmine@~1.1.0:
5576-
version "1.1.2"
5577-
resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
5578-
integrity sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=
5576+
karma-jasmine@^2.0.1, karma-jasmine@~2.0.1:
5577+
version "2.0.1"
5578+
resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-2.0.1.tgz#26e3e31f2faf272dd80ebb0e1898914cc3a19763"
5579+
integrity sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==
5580+
dependencies:
5581+
jasmine-core "^3.3"
55795582

55805583
55815584
version "1.1.0"
@@ -5638,10 +5641,10 @@ karma@alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a:
56385641
tmp "0.0.33"
56395642
useragent "^2.1.12"
56405643

5641-
karma@~3.1.1:
5642-
version "3.1.1"
5643-
resolved "https://registry.yarnpkg.com/karma/-/karma-3.1.1.tgz#94c8edd20fb9597ccde343326da009737fb0423a"
5644-
integrity sha512-NetT3wPCQMNB36uiL9LLyhrOt8SQwrEKt0xD3+KpTCfm0VxVyUJdPL5oTq2Ic5ouemgL/Iz4wqXEbF3zea9kQQ==
5644+
karma@~4.0.0:
5645+
version "4.0.0"
5646+
resolved "https://registry.yarnpkg.com/karma/-/karma-4.0.0.tgz#f28e38a2b66243fde3f98e12a8dcaa2c6ff8ca9c"
5647+
integrity sha512-EFoFs3F6G0BcUGPNOn/YloGOb3h09hzTguyXlg6loHlKY76qbJikkcyPk43m2kfRF65TUGda/mig29QQtyhm1g==
56455648
dependencies:
56465649
bluebird "^3.3.0"
56475650
body-parser "^1.16.1"
@@ -5653,11 +5656,12 @@ karma@~3.1.1:
56535656
di "^0.0.1"
56545657
dom-serialize "^2.2.0"
56555658
expand-braces "^0.1.1"
5659+
flatted "^2.0.0"
56565660
glob "^7.1.1"
56575661
graceful-fs "^4.1.2"
56585662
http-proxy "^1.13.0"
56595663
isbinaryfile "^3.0.0"
5660-
lodash "^4.17.4"
5664+
lodash "^4.17.5"
56615665
log4js "^3.0.0"
56625666
mime "^2.3.1"
56635667
minimatch "^3.0.2"
@@ -5669,7 +5673,7 @@ karma@~3.1.1:
56695673
socket.io "2.1.1"
56705674
source-map "^0.6.1"
56715675
tmp "0.0.33"
5672-
useragent "2.2.1"
5676+
useragent "2.3.0"
56735677

56745678
keyv@^3.0.0:
56755679
version "3.1.0"
@@ -6056,11 +6060,6 @@ lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
60566060
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
60576061
integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
60586062

6059-
6060-
version "2.2.4"
6061-
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
6062-
integrity sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=
6063-
60646063
[email protected], lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
60656064
version "4.1.3"
60666065
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
@@ -10245,15 +10244,7 @@ use@^3.1.0:
1024510244
resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
1024610245
integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
1024710246

10248-
10249-
version "2.2.1"
10250-
resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"
10251-
integrity sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=
10252-
dependencies:
10253-
lru-cache "2.2.x"
10254-
tmp "0.0.x"
10255-
10256-
useragent@^2.1.12:
10247+
[email protected], useragent@^2.1.12:
1025710248
version "2.3.0"
1025810249
resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
1025910250
integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==

0 commit comments

Comments
 (0)