Update jasmine and jasmine types

package.json

@@ -14,7 +14,7 @@
     "@types/argparse": "^1.0.38",
     "@types/emscripten": "~0.0.34",
     "@types/estree": "^0.0.51",
-    "@types/jasmine": "~3.0.0",
+    "@types/jasmine": "~4.0.3",
     "@types/js-yaml": "^4.0.5",
     "@types/long": "4.0.1",
     "@types/mkdirp": "^0.5.2",
@@ -36,8 +36,8 @@
     "core-js": "3",
     "deep-equal": "^1.0.1",
     "estree-walker": "~1.0.1",
-    "jasmine": "~4.1.0",
-    "jasmine-core": "~4.1.1",
+    "jasmine": "~4.2.1",
+    "jasmine-core": "~4.2.0",
     "js-yaml": "^3.14.0",
     "karma": "^6.3.20",
     "karma-browserstack-launcher": "^1.6.0",

tfjs-core/src/io/browser_files_test.ts

@@ -108,7 +108,7 @@ describeWithFlags('browserDownloads', BROWSER_ENVS, () => {
     fakeAnchorCount = 0;
     fakeAnchors = [new FakeHTMLAnchorElement(), new FakeHTMLAnchorElement()];
     spyOn(document, 'createElement').and.callFake((tag: string) => {
-      return fakeAnchors[fakeAnchorCount++];
+      return fakeAnchors[fakeAnchorCount++] as unknown as HTMLElement;
     });
   });
 

tfjs-core/src/io/http_test.ts

@@ -76,7 +76,7 @@ const fakeResponse =
           },
           headers: {get: (key: string) => contentType},
           url: path
-        });
+        }) as unknown as Response;
 
 const setupFakeWeightFiles =
     (fileBufferMap: {

tfjs-core/src/io/weights_loader_test.ts

@@ -24,7 +24,7 @@ describeWithFlags('loadWeights', BROWSER_ENVS, () => {
     [filename: string]: Float32Array|Int32Array|ArrayBuffer|Uint8Array|
     Uint16Array
   }) => {
-    spyOn(tf.env().platform, 'fetch').and.callFake((path: string) => {
+    spyOn(tf.env().platform, 'fetch').and.callFake(async (path: string) => {
       return new Response(
           fileBufferMap[path],
           {headers: {'Content-type': 'application/octet-stream'}});

tfjs-core/src/jasmine_util.ts

@@ -117,7 +117,8 @@ export function setupTestFilters(
   const env = jasmine.getEnv();
 
   // Account for --grep flag passed to karma by saving the existing specFilter.
-  const grepFilter = env.specFilter;
+  const config = env.configuration();
+  const grepFilter = config.specFilter;
 
   /**
    * Filter method that returns boolean, if a given test should run or be
@@ -126,7 +127,7 @@ export function setupTestFilters(
    * list, it will be exluded.
    */
   // tslint:disable-next-line: no-any
-  env.specFilter = (spec: any) => {
+  const specFilter = (spec: any) => {
     // Filter out tests if the --grep flag is passed.
     if (!grepFilter(spec)) {
       return false;
@@ -159,6 +160,8 @@ export function setupTestFilters(
     // Otherwise ignore the test.
     return false;
   };
+
+  env.configure({...config, specFilter});
 }
 
 export function parseTestEnvFromKarmaFlags(

tfjs-core/src/platforms/platform_browser_test.ts

@@ -22,7 +22,7 @@ import {PlatformBrowser} from './platform_browser';
 describeWithFlags('PlatformBrowser', BROWSER_ENVS, async () => {
   it('fetch calls window.fetch', async () => {
     const response = new Response();
-    spyOn(self, 'fetch').and.returnValue(response);
+    spyOn(self, 'fetch').and.returnValue(Promise.resolve(response));
     const platform = new PlatformBrowser();
 
     await platform.fetch('test/url', {method: 'GET'});

tfjs-core/src/platforms/platform_node_test.ts

@@ -49,7 +49,7 @@ describeWithFlags('PlatformNode', NODE_ENVS, () => {
        // Null out the system fetch so we force it to require node-fetch.
        platform_node.resetSystemFetch();
 
-       const testFetch = {fetch: (url: string, init: RequestInit) => {}};
+       const testFetch = {fetch: (url: string, init: RequestInit) => () => {}};
 
        // Mock the actual fetch call.
        spyOn(testFetch, 'fetch').and.returnValue(() => {});
@@ -71,7 +71,7 @@ describeWithFlags('PlatformNode', NODE_ENVS, () => {
      });
 
   it('now should use process.hrtime', async () => {
-    const time = [100, 200];
+    const time: [number, number] = [100, 200];
     spyOn(process, 'hrtime').and.returnValue(time);
     expect(tf.env().platform.now()).toEqual(time[0] * 1000 + time[1] / 1000000);
   });

tfjs-core/src/util_test.ts

@@ -584,7 +584,7 @@ describeWithFlags('util.toNestedArray for a complex tensor', ALL_ENVS, () => {
 
 describe('util.fetch', () => {
   it('should call the platform fetch', () => {
-    spyOn(tf.env().platform, 'fetch').and.callFake(() => {});
+    spyOn(tf.env().platform, 'fetch').and.callFake(async () => new Response());
 
     util.fetch('test/path', {method: 'GET'});