Skip to content

Commit

Permalink
Upgrade to Jasmine 3
Browse files Browse the repository at this point in the history
This upgrades our version of Jasmine and drops the expectAsync
polyfill we added to compensate in Jasmine 2.  This also drops the
direct dependency on Jasmine, preferring the indirect version expected
by an upgraded version of karma-jasmine.

Closes shaka-project#1949

Change-Id: Ibbdb26e9a20ab9b9d8b152678b65c63feed8633c
  • Loading branch information
joeyparrish committed Jun 5, 2019
1 parent 72fa256 commit b042a81
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 148 deletions.
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
"eslint-config-google": "^0.13.0",
"esprima": "^4.0.1",
"htmlhint": "^0.11.0",
"jasmine-ajax": "^3.3.1",
"jasmine-core": "^2.8.0",
"jasmine-ajax": "^4.0.0",
"jsdoc": "github:joeyparrish/jsdoc#45c271fa",
"karma": "^4.1.0",
"karma-babel-preprocessor": "^7.0.0",
Expand All @@ -33,7 +32,7 @@
"karma-edge-launcher": "^0.4.2",
"karma-firefox-launcher": "^1.1.0",
"karma-ie-launcher": "^1.0.0",
"karma-jasmine": "^1.1.0",
"karma-jasmine": "^2.0.1",
"karma-jasmine-ajax": "^0.1.13",
"karma-opera-launcher": "^1.0.0",
"karma-safari-launcher": "^1.0.0",
Expand Down
145 changes: 0 additions & 145 deletions test/test/util/expect_async_polyfill.js

This file was deleted.

0 comments on commit b042a81

Please sign in to comment.