Updates resource injector tests to be ESM-compatible.

Refs #33. This mostly required dropping the Jasmine spy on the `fs` module.
dgp1130 · Mar 4, 2023 · 65d8c23 · 65d8c23
1 parent b3d2431
commit 65d8c23
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/tools/binaries/resource_injector/BUILD.bazel b/tools/binaries/resource_injector/BUILD.bazel
@@ -53,7 +53,7 @@ ts_project(
     data = ["//:node_modules/node-html-parser"],
     deps = [
         ":config",
-        "//common:fs",
+        "//common:file_system",
         "//common:prerender_annotation_walker",
     ],
 )
@@ -65,7 +65,7 @@ ts_project(
     deps = [
         ":config",
         ":injector",
-        "//common:fs",
+        "//common:file_system_fake",
         "//common/models:prerender_annotation",
         "//:node_modules/@types/jasmine",
     ],

diff --git a/tools/binaries/resource_injector/injector.ts b/tools/binaries/resource_injector/injector.ts
@@ -1,7 +1,7 @@
-import * as fs from '../../../common/fs';
 import { HTMLElement, parse } from 'node-html-parser';
 import { InjectorConfig, InjectScript } from './config';
 import { AnnotationNode, walkAllAnnotations } from '../../../common/prerender_annotation_walker';
+import { FileSystem, diskFs } from '../../../common/file_system';
 
 /**
  * Parses the given HTML document and injects all the resources specified by the
@@ -14,8 +14,11 @@ import { AnnotationNode, walkAllAnnotations } from '../../../common/prerender_an
  *     injected into the HTML document.
  * @returns A new HTML document with all the resources injected into it.
  */
-export async function inject(html: string, config: InjectorConfig):
-        Promise<string> {
+export async function inject(
+    html: string,
+    config: InjectorConfig,
+    fs: FileSystem = diskFs,
+): Promise<string> {
     // Parse input HTML.
     const root = parse(html, {
         comment: true,
@@ -40,7 +43,7 @@ export async function inject(html: string, config: InjectorConfig):
     }
 
     // Inject `<style />` tags for each inline style annotation in the document.
-    await replaceInlineStyleAnnotations(walkAllAnnotations(root));
+    await replaceInlineStyleAnnotations(walkAllAnnotations(root), fs);
 
     // Return the new document.
     return root.toString();
@@ -109,6 +112,7 @@ function injectScript(root: HTMLElement, action: InjectScript): void {
  */
 async function replaceInlineStyleAnnotations(
     nodes: Generator<AnnotationNode, void, void>,
+    fs: FileSystem,
 ): Promise<void> {
     for (const node of nodes) {
         const { annotation } = node;
@@ -128,7 +132,7 @@ async function replaceInlineStyleAnnotations(
             null /* parentNode */,
             [0, 0] /* range */,
         );
-        inlineStyle.set_content(await fs.readFile(annotation.path, 'utf-8'));
+        inlineStyle.set_content(await fs.readFile(annotation.path, 'utf8'));
         node.replace(inlineStyle);
     }
 }

diff --git a/tools/binaries/resource_injector/injector_test.ts b/tools/binaries/resource_injector/injector_test.ts
@@ -1,4 +1,4 @@
-import * as fs from '../../../common/fs';
+import { FileSystemFake } from '../../../common/file_system_fake';
 import { createAnnotation } from '../../../common/models/prerender_annotation';
 import { InjectorConfig } from './config';
 import { inject } from './injector';
@@ -111,10 +111,13 @@ describe('injector', () => {
 </html>
             `.trim();
 
-            spyOn(fs, 'readFile').and.resolveTo('.foo { color: red; }');
+            const fs = FileSystemFake.of({
+                'foo.css': '.foo { color: red; }',
+            });
+            spyOn(fs, 'readFile').and.callThrough();
 
-            const injected = await inject(input, []);
-            expect(fs.readFile).toHaveBeenCalledWith('foo.css', 'utf-8');
+            const injected = await inject(input, [], fs);
+            expect(fs.readFile).toHaveBeenCalledWith('foo.css', 'utf8');
 
             expect(injected).toBe(`
 <!DOCTYPE html>

diff --git a/tools/binaries/resource_injector/resource_injector_test.ts b/tools/binaries/resource_injector/resource_injector_test.ts
@@ -351,6 +351,6 @@ describe('injector', () => {
             `Binary unexpectedly succeeded. STDERR:\n${stderr}`,
         );
         expect(stdout).toBe('');
-        expect(stderr).toContain('tools/binaries/resource_injector/injector.js');
+        expect(stderr).toContain('tools/binaries/resource_injector/injector');
     });
 });