Merge pull request #65 from Stassi/feature/test-utility-extraction

feature/test-utility-extraction

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stassi/leaf",
-  "version": "0.0.64",
+  "version": "0.0.65",
   "description": "Leaflet adapter.",
   "keywords": [
     "cartography",
@@ -46,6 +46,9 @@
     "globalSetup": "jest-environment-puppeteer/setup",
     "globalTeardown": "jest-environment-puppeteer/teardown",
     "maxWorkers": 1,
+    "moduleNameMapper": {
+      "^test-utilities/(.*)\\.js$": "<rootDir>/src/test-utilities/$1.ts"
+    },
     "preset": "ts-jest/presets/default-esm",
     "setupFilesAfterEnv": [
       "expect-puppeteer"

rollup.config.ts

@@ -62,7 +62,11 @@ const aliasOptions: RollupAliasOptions = {
         inject(injectOptions),
         typescript({
           declaration: true,
-          exclude: ['rollup.config.ts', 'src/tutorial/**/*.ts'],
+          exclude: [
+            'rollup.config.ts',
+            'src/test-utilities/**/*.ts',
+            'src/tutorial/**/*.ts',
+          ],
           outDir: './dist',
         }),
         terser(),

src/test-utilities/expect-images-loaded.ts

@@ -0,0 +1,29 @@
+export function expectImagesLoaded(source: string): () => Promise<void> {
+  return async (): Promise<void> => {
+    await page.waitForFunction(
+      (src: string): boolean => {
+        return Array.from(document.querySelectorAll(`img[src="${src}"]`)).every(
+          (img: Element): boolean =>
+            img instanceof HTMLImageElement
+              ? img.complete && img.naturalHeight > 0 && img.naturalWidth > 0
+              : false,
+        )
+      },
+      undefined,
+      source,
+    )
+
+    for (const img of await page.$$(`img[src="${source}"]`)) {
+      expect(
+        await img.evaluate(
+          ({
+            complete,
+            naturalHeight,
+            naturalWidth,
+          }: HTMLImageElement): boolean =>
+            complete && naturalHeight > 0 && naturalWidth > 0,
+        ),
+      ).toBe(true)
+    }
+  }
+}

src/tutorial/custom-icons/custom-icons.test.ts

@@ -1,3 +1,5 @@
+import { expectImagesLoaded } from 'test-utilities/expect-images-loaded.js'
+
 describe('custom icons tutorial', (): void => {
   describe.each([1, 2])(
     'device scale factor: %d',
@@ -9,39 +11,6 @@ describe('custom icons tutorial', (): void => {
 
       describe('map', (): void => {
         describe('markers with custom icons', (): void => {
-          function expectImagesLoaded(source: string): () => Promise<void> {
-            return async (): Promise<void> => {
-              await page.waitForFunction(
-                (src: string): boolean => {
-                  return Array.from(
-                    document.querySelectorAll(`img[src="${src}"]`),
-                  ).every((img: Element): boolean =>
-                    img instanceof HTMLImageElement
-                      ? img.complete &&
-                        img.naturalHeight > 0 &&
-                        img.naturalWidth > 0
-                      : false,
-                  )
-                },
-                undefined,
-                source,
-              )
-
-              for (const img of await page.$$(`img[src="${source}"]`)) {
-                expect(
-                  await img.evaluate(
-                    ({
-                      complete,
-                      naturalHeight,
-                      naturalWidth,
-                    }: HTMLImageElement): boolean =>
-                      complete && naturalHeight > 0 && naturalWidth > 0,
-                  ),
-                ).toBe(true)
-              }
-            }
-          }
-
           describe.each([
             {
               popupText: 'I am a green leaf.',

tsconfig.json

@@ -6,7 +6,8 @@
     "module": "ESNext",
     "moduleResolution": "node",
     "paths": {
-      "@stassi/leaf": ["src/index.ts"]
+      "@stassi/leaf": ["src/index.ts"],
+      "test-utilities/*": ["src/test-utilities/*"]
     },
     "strict": true,
     "target": "ESNext"