Update Jasmine from 3.1.0 to 4.2.1 #6520

mattsoulanille · 2022-06-10T00:30:08Z

Update jasmine from 3.1.0 to 4.2.1 for Bazel packages. Update karma from 6.3.16 to 6.4.0.

Remove deprecated use of async function and done callback at the same time. For example, the following code

it('does a test', async (done) => {
  if(!okay()) {
    done.fail();
  }
  done();
});

becomes this instead.

it('does a test', async () => {
  if(!okay()) {
    fail();
  }
});

Add karma-jasmine-html-reporter to show test status in the browser window.

Depends on #6563

To see the logs from the Cloud Build CI, please join either our discussion or announcement mailing list.

This change is

…l_reporter

According to the ESModules standard, code can not modify properties of modules. TypeScript 4 will enforce this rule. This in particular affects tests for executors in tfjs-converter, in which we often spy on tfOps. This PR removes all instances of `spyOn(tfOps,...)` and replaces them with a separate `spyOps` mock / fake which is passed to the `executeOp` function. This PR was part of the larger TS4 upgrade PR (tensorflow#6346), but I'm splitting that PR into pieces that can be merged while we're still using TS3 because it's too large to keep up-to-date.

…t need mediaDevices

Linchenn

LGTM!

…escript2

mattsoulanille · 2022-06-29T22:59:35Z

e2e/karma.conf.js

  coverageOptions: {instrumentation: false},
  bundlerOptions: {
    sourceMap: true,
-    acornOptions: {ecmaVersion: 8},


This fixes a typescript compilation issue in e2e tests.

mattsoulanille · 2022-06-29T23:00:26Z

tfjs-automl/package.json

-    "@tensorflow/tfjs-backend-webgl": "^3.9.0",
    "@types/jasmine": "~2.8.6",
    "clang-format": "~1.8.0",
+    "jasmine": "3.1.0",


jasmine was missing as a dependency of tfjs-automl, so it was using the root jasmine version. This caused tests to fail when the root jasmine was upgraded to 4.

mattsoulanille · 2022-06-29T23:02:06Z

tfjs-data/BUILD.bazel

        "bs_chrome_mac",
        "win_10_chrome",
    ],
+    local_browser = "chrome_autoplay",


Use chrome_autoplay custom browser so media can play without user interaction.

mattsoulanille · 2022-06-29T23:03:25Z

tfjs-data/src/readers_test.ts

-      const videoElement = document.createElement('video');
-      videoElement.width = 160;
-      videoElement.height = 90;
+describeWithFlags('readers in browser', MEDIA_ENVS, () => {


MEDIA_ENVS is a new constraint set that only runs if navigator.mediaDevices is not null. It's required because jasmine 4 prohibits empty describe blocks, which the if statement would cause.

mattsoulanille · 2022-06-29T23:04:02Z

tfjs-data/src/util/test_utils.ts


+export const MEDIA_ENVS: Constraints = {
+  predicate: (env) => BROWSER_ENVS.predicate(env)
+    && navigator.mediaDevices != null


New Constraints set to only run if media devices are available.

mattsoulanille · 2022-06-29T23:05:04Z

tools/karma_template.conf.js

+  chrome_autoplay: {
+    base: 'Chrome',
+    flags: ['--autoplay-policy=no-user-gesture-required'],
+  },


The chrome_autoplay browser allows media to play without user interaction.

mattsoulanille · 2022-06-29T23:05:19Z

tools/karma_template.conf.js

  }

  config.set({
+    reporters: ['kjhtml'],


New in-browser karma reporter.

pyu10055

thanks!

Reviewed 34 of 34 files at r1, all commit messages.
Reviewable status: complete! 2 of 1 approvals obtained (waiting on @mattsoulanille)

tfjs-automl/package.json line 35 at r1 (raw file):

Previously, mattsoulanille (Matthew Soulanille) wrote…

jasmine was missing as a dependency of tfjs-automl, so it was using the root jasmine version. This caused tests to fail when the root jasmine was upgraded to 4.

awesome!

tfjs-backend-wasm/src/index_test.ts line 240 at r1 (raw file):

// describe('wasm pre.js', () => {
  // Temporarily disabled due to node 16 incompatability

this test is commented out?

tools/karma_template.conf.js line 76 at r1 (raw file):

Previously, mattsoulanille (Matthew Soulanille) wrote…

The chrome_autoplay browser allows media to play without user interaction.

how is the purpose for using this flag?

tools/karma_template.conf.js line 127 at r1 (raw file):

Previously, mattsoulanille (Matthew Soulanille) wrote…

New in-browser karma reporter.

nice!

mattsoulanille

Reviewable status: complete! 2 of 1 approvals obtained (waiting on @mattsoulanille and @pyu10055)

tfjs-backend-wasm/src/index_test.ts line 240 at r1 (raw file):

Previously, pyu10055 (Ping Yu) wrote…

this test is commented out?

I should maybe remove this test. It requires removing the process variable, which isn't really supported in node 16+.

tools/karma_template.conf.js line 76 at r1 (raw file):

Previously, pyu10055 (Ping Yu) wrote…

how is the purpose for using this flag?

It's required for some tfjs-data tests that play media. We need the media to play in karma tests without human interaction.

mattsoulanille and others added 17 commits June 9, 2022 17:28

Display Jasmine test results in Karma browsers

418523d

Merge remote-tracking branch 'upstream/master' into karma_jasmine_htm…

3155ca8

…l_reporter

[layers] Remove 'async (done) =>' Jasmine antipattern

07bfc7a

Update jasmine and jasmine types

a60eacf

Upgrade karma-jasmine to ~5.1.0 to fix specFilter not working

c012e8a

[webgl] Fix test value type

385092e

[tflite] Fix test esbuild bundle missing input files

da458a9

[data] Remove deprecated 'async (done) =>' jasmine style

90422a4

[data] Use a browser that allows autoplay

4ebf81b

Comment out 'wasm pre.js' describe, which has only disabled tests

69b67b0

Remove 'Response' constructor from util_test to work in Node

6e0cd3d

Merge remote-tracking branch 'upstream/master' into karma_jasmine_htm…

004ef46

…l_reporter

Bump tsconfig lib to es2019

5be5f24

Disable no-any for spyOps type assertion

4851622

Add module_name back to converter test lib

099479e

[converter] Remove deprecated 'async (done) =>' jasmine style

fa157c2

mattsoulanille changed the title ~~Display Jasmine test results in Karma browsers~~ Update karma and jasmine Jun 24, 2022

Merge branch 'master' into karma_jasmine_html_reporter

e522d10

mattsoulanille changed the title ~~Update karma and jasmine~~ Update Jasmine to 4.2.1 Jun 24, 2022

mattsoulanille changed the title ~~Update Jasmine to 4.2.1~~ Update Jasmine from 3.1.0 to 4.2.1 Jun 24, 2022

mattsoulanille added 4 commits June 23, 2022 18:01

Bazel lint

8bdb229

lint

bf939f0

Use describeWithFlags instead of an if statement to disable tests tha…

e5f586b

…t need mediaDevices

Merge branch 'master' into karma_jasmine_html_reporter

bea3ac5

mattsoulanille marked this pull request as ready for review June 29, 2022 00:06

Merge branch 'master' into karma_jasmine_html_reporter

d1de3a1

mattsoulanille requested review from Linchenn and pyu10055 June 29, 2022 00:07

Linchenn approved these changes Jun 29, 2022

View reviewed changes

mattsoulanille added 8 commits June 28, 2022 17:30

Fix lint errors

1da4de3

Merge branch 'master' into karma_jasmine_html_reporter

dd2cdce

Merge branch 'master' into karma_jasmine_html_reporter

f85c244

Merge branch 'master' into karma_jasmine_html_reporter

b2c93fa

Merge branch 'master' into karma_jasmine_html_reporter

9a96d24

Merge branch 'master' into karma_jasmine_html_reporter

172db2c

Add missing jasmine dependency to automl and update rollup-plugin-typ…

dc9fc38

…escript2

Fix e2e tests

241835e

mattsoulanille commented Jun 29, 2022

View reviewed changes

pyu10055 approved these changes Jun 29, 2022

View reviewed changes

mattsoulanille merged commit 189ac32 into tensorflow:master Jun 29, 2022

mattsoulanille requested a review from pyu10055 June 29, 2022 23:28

mattsoulanille commented Jun 29, 2022

View reviewed changes

mattsoulanille mentioned this pull request Jul 1, 2022

iOS and Mac Safari Tests Failing After #6520 #6598

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update Jasmine from 3.1.0 to 4.2.1 #6520

Update Jasmine from 3.1.0 to 4.2.1 #6520

Uh oh!

mattsoulanille commented Jun 10, 2022 •

edited

Loading

Uh oh!

Linchenn left a comment

Uh oh!

mattsoulanille Jun 29, 2022

Uh oh!

mattsoulanille Jun 29, 2022

Uh oh!

mattsoulanille Jun 29, 2022

Uh oh!

mattsoulanille Jun 29, 2022

Uh oh!

mattsoulanille Jun 29, 2022

Uh oh!

mattsoulanille Jun 29, 2022

Uh oh!

mattsoulanille Jun 29, 2022

Uh oh!

pyu10055 left a comment

Uh oh!

mattsoulanille left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Update Jasmine from 3.1.0 to 4.2.1 #6520

Update Jasmine from 3.1.0 to 4.2.1 #6520

Uh oh!

Conversation

mattsoulanille commented Jun 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Linchenn left a comment

Choose a reason for hiding this comment

Uh oh!

mattsoulanille Jun 29, 2022

Choose a reason for hiding this comment

Uh oh!

mattsoulanille Jun 29, 2022

Choose a reason for hiding this comment

Uh oh!

mattsoulanille Jun 29, 2022

Choose a reason for hiding this comment

Uh oh!

mattsoulanille Jun 29, 2022

Choose a reason for hiding this comment

Uh oh!

mattsoulanille Jun 29, 2022

Choose a reason for hiding this comment

Uh oh!

mattsoulanille Jun 29, 2022

Choose a reason for hiding this comment

Uh oh!

mattsoulanille Jun 29, 2022

Choose a reason for hiding this comment

Uh oh!

pyu10055 left a comment

Choose a reason for hiding this comment

Uh oh!

mattsoulanille left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mattsoulanille commented Jun 10, 2022 •

edited

Loading