Update Jasmine from 3.1.0 to 4.2.1

.bazelignore

@@ -16,3 +16,4 @@ tfjs-node-gpu/node_modules
 tfjs-react-native/node_modules
 tfjs-tflite/node_modules
 tfjs-vis/node_modules
+e2e/node_modules

package.json

@@ -15,7 +15,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",
@@ -37,14 +37,15 @@
     "core-js": "3",
     "deep-equal": "^1.0.1",
     "estree-walker": "~1.0.1",
-    "jasmine": "~3.1.0",
-    "jasmine-core": "~3.1.0",
+    "jasmine": "~4.2.1",
+    "jasmine-core": "~4.2.0",
     "js-yaml": "^3.14.0",
-    "karma": "^6.3.16",
+    "karma": "^6.4.0",
     "karma-browserstack-launcher": "^1.6.0",
-    "karma-chrome-launcher": "^3.1.0",
-    "karma-firefox-launcher": "^2.1.0",
-    "karma-jasmine": "~1.0.1",
+    "karma-chrome-launcher": "^3.1.1",
+    "karma-firefox-launcher": "^2.1.2",
+    "karma-jasmine": "~5.1.0",
+    "karma-jasmine-html-reporter": "^2.0.0",
     "karma-requirejs": "^1.1.0",
     "karma-sourcemap-loader": "^0.3.8",
     "long": "4.0.0",

tfjs-backend-wasm/src/index_test.ts

@@ -236,7 +236,7 @@ describeWithFlags('wasm init', BROWSER_ENVS, () => {
   });
 });
 
-describe('wasm pre.js', () => {
+// describe('wasm pre.js', () => {
   // Temporarily disabled due to node 16 incompatability
   // it('works if process variable is undefined', async () => {
   //   tf.engine().reset();
@@ -259,4 +259,4 @@ describe('wasm pre.js', () => {
   //   tf.engine().disposeVariables();
   //   tf.engine().reset();
   // });
-});
+// });

tfjs-backend-webgl/src/backend_webgl_test.ts

@@ -318,7 +318,7 @@ describeWithFlags('Custom window size', WEBGL_ENVS, () => {
     // This will set the screen size to 1x1 to make sure the page limit is
     // very small.
     spyOnProperty(window, 'screen', 'get')
-        .and.returnValue({height: 1, width: 1});
+        .and.returnValue({height: 1, width: 1} as unknown as Screen);
 
     tf.registerBackend(customBackendName, () => new MathBackendWebGL());
     tf.setBackend(customBackendName);

tfjs-converter/src/operations/executors/control_executor_test.ts

@@ -438,7 +438,7 @@ describe('control', () => {
       };
       const condExecutor = new GraphExecutor(graph);
       let firstTime = true;
-      spyOn(condExecutor, 'executeFunctionAsync').and.callFake(() => {
+      spyOn(condExecutor, 'executeFunctionAsync').and.callFake(async () => {
         if (firstTime) {
           firstTime = false;
           return input1;
@@ -447,7 +447,8 @@ describe('control', () => {
       });
       const bodyExecutor = new GraphExecutor(graph);
       const input3 = [tfOps.scalar(3, 'int32')];
-      spyOn(bodyExecutor, 'executeFunctionAsync').and.returnValue(input3);
+      spyOn(bodyExecutor, 'executeFunctionAsync').and
+        .returnValue(Promise.resolve(input3));
       context.functionMap['bodyFunc'] = bodyExecutor;
       context.functionMap['condFunc'] = condExecutor;
       const result = await executeOp(node, {cond, input1, input2}, context);
@@ -488,7 +489,7 @@ describe('control', () => {
       };
       const condExecutor = new GraphExecutor(graph);
       let firstTime = true;
-      spyOn(condExecutor, 'executeFunctionAsync').and.callFake(() => {
+      spyOn(condExecutor, 'executeFunctionAsync').and.callFake(async () => {
         if (firstTime) {
           firstTime = false;
           return input1;
@@ -497,7 +498,8 @@ describe('control', () => {
       });
       const bodyExecutor = new GraphExecutor(graph);
       const input3 = [tfOps.scalar(3, 'int32')];
-      spyOn(bodyExecutor, 'executeFunctionAsync').and.returnValue(input3);
+      spyOn(bodyExecutor, 'executeFunctionAsync').and
+        .returnValue(Promise.resolve(input3));
       context.functionMap['bodyFunc'] = bodyExecutor;
       context.functionMap['condFunc'] = condExecutor;
       const result = await executeOp(node, {cond, input1, input2}, context);
@@ -538,9 +540,11 @@ describe('control', () => {
         signature: {}
       };
       const thenExecutor = new GraphExecutor(graph);
-      spyOn(thenExecutor, 'executeFunctionAsync').and.returnValue(input1);
+      spyOn(thenExecutor, 'executeFunctionAsync').and
+        .returnValue(Promise.resolve(input1));
       const elseExecutor = new GraphExecutor(graph);
-      spyOn(elseExecutor, 'executeFunctionAsync').and.returnValue(input2);
+      spyOn(elseExecutor, 'executeFunctionAsync').and
+        .returnValue(Promise.resolve(input2));
       context.functionMap['thenFunc'] = thenExecutor;
       context.functionMap['elseFunc'] = elseExecutor;
       const result = await executeOp(node, {cond, input1, input2}, context);
@@ -569,9 +573,11 @@ describe('control', () => {
         signature: {}
       };
       const thenExecutor = new GraphExecutor(graph);
-      spyOn(thenExecutor, 'executeFunctionAsync').and.returnValue(input1);
+      spyOn(thenExecutor, 'executeFunctionAsync').and
+        .returnValue(Promise.resolve(input1));
       const elseExecutor = new GraphExecutor(graph);
-      spyOn(elseExecutor, 'executeFunctionAsync').and.returnValue(input2);
+      spyOn(elseExecutor, 'executeFunctionAsync').and
+        .returnValue(Promise.resolve(input2));
       context.functionMap['thenFunc'] = thenExecutor;
       context.functionMap['elseFunc'] = elseExecutor;
       const result = await executeOp(node, {cond, input1, input2}, context);
@@ -612,9 +618,11 @@ describe('control', () => {
         signature: {}
       };
       const thenExecutor = new GraphExecutor(graph);
-      spyOn(thenExecutor, 'executeFunctionAsync').and.returnValue(input1);
+      spyOn(thenExecutor, 'executeFunctionAsync').and
+        .returnValue(Promise.resolve(input1));
       const elseExecutor = new GraphExecutor(graph);
-      spyOn(elseExecutor, 'executeFunctionAsync').and.returnValue(input2);
+      spyOn(elseExecutor, 'executeFunctionAsync').and
+        .returnValue(Promise.resolve(input2));
       context.functionMap['thenFunc'] = thenExecutor;
       context.functionMap['elseFunc'] = elseExecutor;
       const result = await executeOp(node, {cond, input1, input2}, context);
@@ -643,9 +651,11 @@ describe('control', () => {
         signature: {}
       };
       const thenExecutor = new GraphExecutor(graph);
-      spyOn(thenExecutor, 'executeFunctionAsync').and.returnValue(input1);
+      spyOn(thenExecutor, 'executeFunctionAsync').and
+        .returnValue(Promise.resolve(input1));
       const elseExecutor = new GraphExecutor(graph);
-      spyOn(elseExecutor, 'executeFunctionAsync').and.returnValue(input2);
+      spyOn(elseExecutor, 'executeFunctionAsync').and
+        .returnValue(Promise.resolve(input2));
       context.functionMap['thenFunc'] = thenExecutor;
       context.functionMap['elseFunc'] = elseExecutor;
       const result = await executeOp(node, {cond, input1, input2}, context);

tfjs-converter/src/operations/executors/hash_table_executor_test.ts

@@ -119,7 +119,7 @@ describe('hash_table', () => {
         expect(after).toBe(before + 1);
       });
 
-      it('should throw if dtype doesnot match.', async (done) => {
+      it('should throw if dtype doesnot match.', async () => {
         const hashTable = new HashTable('string', 'float32');
 
         resourceManager.addHashTable('hashtable', hashTable);
@@ -135,17 +135,16 @@ describe('hash_table', () => {
         const before = memory().numTensors;
         try {
           await executeOp(node, {input3, input5}, context, resourceManager);
-          done.fail('Should fail, succeed unexpectedly.');
+          fail('Should fail, succeed unexpectedly.');
         } catch (err) {
           expect(err).toMatch(/Expect key dtype/);
         }
         const after = memory().numTensors;
         expect(after).toBe(before);
-        done();
       });
 
       it('should throw if length of keys and values doesnot match.',
-         async (done) => {
+         async () => {
            const hashTable = new HashTable('string', 'float32');
 
            resourceManager.addHashTable('hashtable', hashTable);
@@ -161,13 +160,12 @@ describe('hash_table', () => {
            const before = memory().numTensors;
            try {
              await executeOp(node, {input3, input5}, context, resourceManager);
-             done.fail('Should fail, succeed unexpectedly.');
+             fail('Should fail, succeed unexpectedly.');
            } catch (err) {
              expect(err).toMatch(/The number of elements doesn't match/);
            }
            const after = memory().numTensors;
            expect(after).toBe(before);
-           done();
          });
 
       it('should match json def.', () => {
@@ -200,7 +198,7 @@ describe('hash_table', () => {
         expect(after).toBe(before + 1);
       });
 
-      it('should throw if dtype doesnot match.', async (done) => {
+      it('should throw if dtype doesnot match.', async () => {
         const hashTable = new HashTable('string', 'float32');
 
         resourceManager.addHashTable('hashtable', hashTable);
@@ -216,17 +214,16 @@ describe('hash_table', () => {
         const before = memory().numTensors;
         try {
           await executeOp(node, {input3, input5}, context, resourceManager);
-          done.fail('Should fail, succeed unexpectedly.');
+          fail('Should fail, succeed unexpectedly.');
         } catch (err) {
           expect(err).toMatch(/Expect key dtype/);
         }
         const after = memory().numTensors;
         expect(after).toBe(before);
-        done();
       });
 
       it('should throw if length of keys and values doesnot match.',
-         async (done) => {
+         async () => {
            const hashTable = new HashTable('string', 'float32');
 
            resourceManager.addHashTable('hashtable', hashTable);
@@ -242,13 +239,12 @@ describe('hash_table', () => {
            const before = memory().numTensors;
            try {
              await executeOp(node, {input3, input5}, context, resourceManager);
-             done.fail('Should fail, succeed unexpectedly.');
+             fail('Should fail, succeed unexpectedly.');
            } catch (err) {
              expect(err).toMatch(/The number of elements doesn't match/);
            }
            const after = memory().numTensors;
            expect(after).toBe(before);
-           done();
          });
 
       it('should match json def.', () => {
@@ -305,7 +301,7 @@ describe('hash_table', () => {
         // Create a result tensor.
         expect(after).toBe(before + 1);
       });
-      it('should throw if dtype doesnot match.', async (done) => {
+      it('should throw if dtype doesnot match.', async () => {
         const hashTable = new HashTable('string', 'float32');
 
         resourceManager.addHashTable('hashtable', hashTable);
@@ -341,13 +337,12 @@ describe('hash_table', () => {
         const before = memory().numTensors;
         try {
           await executeOp(node, {input3, input5}, context, resourceManager);
-          done.fail('Shoudl fail, succeed unexpectedly.');
+          fail('Shoudl fail, succeed unexpectedly.');
         } catch (err) {
           expect(err).toMatch(/Expect key dtype/);
         }
         const after = memory().numTensors;
         expect(after).toBe(before);
-        done();
       });
       it('should match json def.', () => {
         node.op = 'LookupTableFind';
@@ -403,7 +398,7 @@ describe('hash_table', () => {
         // Create a result tensor.
         expect(after).toBe(before + 1);
       });
-      it('should throw if dtype doesnot match.', async (done) => {
+      it('should throw if dtype doesnot match.', async () => {
         const hashTable = new HashTable('string', 'float32');
 
         resourceManager.addHashTable('hashtable', hashTable);
@@ -439,13 +434,12 @@ describe('hash_table', () => {
         const before = memory().numTensors;
         try {
           await executeOp(node, {input3, input5}, context, resourceManager);
-          done.fail('Shoudl fail, succeed unexpectedly.');
+          fail('Shoudl fail, succeed unexpectedly.');
         } catch (err) {
           expect(err).toMatch(/Expect key dtype/);
         }
         const after = memory().numTensors;
         expect(after).toBe(before);
-        done();
       });
       it('should match json def.', () => {
         node.op = 'LookupTableFindV2';

tfjs-converter/src/operations/operation_executor_test.ts

@@ -81,7 +81,7 @@ describe('OperationExecutor', () => {
             const tidySpy = jasmine.createSpy('tidy spy', tfc.tidy);
 
             node.category = category.CATEGORY;
-            executeOp(node, {}, context, undefined, tidySpy);
+            executeOp(node, {}, context, undefined, tidySpy as typeof tfc.tidy);
             expect(tidySpy).toHaveBeenCalled();
           });
         });

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,8 @@ 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 () => ({} as unknown as Response));
 
     util.fetch('test/path', {method: 'GET'});
 

tfjs-data/BUILD.bazel

@@ -62,6 +62,7 @@ tfjs_web_test(
         "bs_chrome_mac",
         "win_10_chrome",
     ],
+    local_browser = "chrome_autoplay",
     static_files = [
         # Listed here so sourcemaps are served
         "//tfjs-data/src:tfjs-data_test_bundle",