commit ba615e892fcba47124f81ae826e1f9e260f36ed6
author Nathaniel Nifong <nifong@google.com> Fri Sep 18 15:26:39 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Sep 23 14:51:27 2020 +0000
tree 97df80a335bc01949d684f250d62aeeca0b0b282
parent 443d2c17b79be6a5aa8e5f3a0af8971d5390ba6b

Fixes for canvaskit karma tests in google3

Change-Id: I4945f99016ed7424ed0fe8cca1f0006396a1ad44
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317857
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Nathaniel Nifong <nifong@google.com>

modules/canvaskit/karma.google3.conf.js

diff --git a/modules/canvaskit/karma.google3.conf.js b/modules/canvaskit/karma.google3.conf.js
index 51deb7c..8b5579c 100644
--- a/modules/canvaskit/karma.google3.conf.js
+++ b/modules/canvaskit/karma.google3.conf.js
@@ -8,13 +8,14 @@
   config.files.unshift(
     // pattern is a path relative to google3 root referring to any file
     // provided by a target in the data attribute of the js_library of the test.
-    { pattern: 'third_party/skia/HEAD/modules/canvaskit/minimal_skottie_wasm/minimal_skottie_cc.wasm', included:false, served:true},
-    { pattern: 'third_party/skia/HEAD/modules/canvaskit/minimal_skottie_wasm/minimal_skottie_cc.js', included:true, served:false},
-    { pattern: 'third_party/skia/HEAD/modules/canvaskit/tests/assets/animated_gif.json', included:false, served:true},
+    { pattern: 'third_party/skia/HEAD/modules/canvaskit/tests/util.js', included:true, served:false},
+    { pattern: 'third_party/skia/HEAD/modules/canvaskit/canvaskit_wasm/canvaskit_cc.wasm', included:false, served:true},
+    { pattern: 'third_party/skia/HEAD/modules/canvaskit/canvaskit_wasm/canvaskit_cc.js', included:true, served:false},
+    { pattern: 'third_party/skia/HEAD/modules/canvaskit/tests/assets/*', included:false, served:true},
   );
 
   // proxies have the following form
   // {'/dir-to-serve/': '/base/dir-relative-to-google3-root'}
-  config.proxies['/canvaskit/'] = '/base/third_party/skia/HEAD/modules/canvaskit/minimal_skottie_wasm/';
+  config.proxies['/canvaskit/'] = '/base/third_party/skia/HEAD/modules/canvaskit/canvaskit_wasm/';
   config.proxies['/assets/'] = '/base/third_party/skia/HEAD/modules/canvaskit/tests/assets/';
 };

modules/canvaskit/tests/skottie.spec.js

diff --git a/modules/canvaskit/tests/skottie.spec.js b/modules/canvaskit/tests/skottie.spec.js
index 47b6dee..afe7f25 100644
--- a/modules/canvaskit/tests/skottie.spec.js
+++ b/modules/canvaskit/tests/skottie.spec.js
@@ -34,6 +34,7 @@
             console.warn('Skipping test because not compiled with skottie');
             return;
         }
+        expect(promises[1]).not.toBe('NOT FOUND');
         const animation = CanvasKit.MakeManagedAnimation(promises[1], {
             'flightAnim.gif': promises[0],
         });
@@ -63,6 +64,7 @@
             console.warn('Skipping test because not compiled with skottie');
             return;
         }
+        expect(promises[0]).not.toBe('NOT FOUND');
         const bounds = CanvasKit.LTRBRect(0, 0, 500, 500);
         canvas.clear(CanvasKit.WHITE);