refactor and add more tests

nextstrain · Apr 16, 2020 · 6ef74f1 · 6ef74f1
1 parent 0f68a7b
commit 6ef74f1
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 25 deletions.
diff --git a/test/integration/__image_snapshots__/Color by: author-snap.png b/test/integration/__image_snapshots__/Color by: author-snap.png
diff --git a/test/integration/__image_snapshots__/Color by: country-snap.png b/test/integration/__image_snapshots__/Color by: country-snap.png
diff --git a/test/integration/__image_snapshots__/Color by: region-snap.png b/test/integration/__image_snapshots__/Color by: region-snap.png
diff --git a/...e_snapshots__/zika-test-js-zika-color-by-date-matches-the-screenshot-1-snap.png b/...e_snapshots__/zika-test-js-zika-color-by-date-matches-the-screenshot-1-snap.png
diff --git a/test/integration/helpers.js b/test/integration/helpers.js
@@ -1,6 +1,6 @@
 const WAIT_BETWEEN_SCREENSHOTS_MS = 100;
 
-export async function waitUntilScreenSteady() {
+export async function waitUntilScreenStable() {
   const RETRY_TIMES = 5;
   let attempt = 0;
 

diff --git a/test/integration/zika.test.js b/test/integration/zika.test.js
@@ -1,4 +1,4 @@
-import { waitUntilScreenSteady } from "./helpers";
+import { waitUntilScreenStable } from "./helpers";
 
 describe("Zika", () => {
   it("displays the title on the page", async () => {
@@ -15,41 +15,69 @@ describe("Zika", () => {
   });
 
   describe("Color by", () => {
+    describe("author", () => {
+      it("matches the screenshot", async () => {
+        await toMatchImageSnapshot("author", async () => {
+          await page.keyboard.press("ArrowUp");
+          await page.keyboard.press("Enter");
+        });
+      });
+    });
+
+    describe("country", () => {
+      it("matches the screenshot", async () => {
+        await toMatchImageSnapshot("country", () => {});
+      });
+    });
+
     describe("date", () => {
       it("matches the screenshot", async () => {
-        await goToZikaPage();
+        await toMatchImageSnapshot("date", async () => {
+          await page.keyboard.press("ArrowUp");
+          await page.keyboard.press("ArrowUp");
+          await page.keyboard.press("Enter");
+        });
+      });
+    });
 
-        const colorBySelector = await expect(page).toMatchElement("#selectColorBy");
+    describe("region", () => {
+      it("matches the screenshot", async () => {
+        await toMatchImageSnapshot("region", async () => {
+          await page.keyboard.press("ArrowDown");
+          await page.keyboard.press("Enter");
+        });
+      });
+    });
+  });
+});
 
-        await colorBySelector.click();
+async function toMatchImageSnapshot(option, selectOptionTest) {
+  await goToZikaPage();
 
-        await page.keyboard.press("ArrowUp");
-        await page.keyboard.press("ArrowUp");
-        await page.keyboard.press("Enter");
+  const colorBySelector = await expect(page).toMatchElement("#selectColorBy");
 
-        const EXPECTED_OPTION = "date";
+  await colorBySelector.click();
 
-        await expect(colorBySelector).toMatch(EXPECTED_OPTION);
+  await selectOptionTest();
 
-        const treeTitle = await expect(page).toMatchElement("#Title");
+  await expect(colorBySelector).toMatch(option);
 
-        await expect(treeTitle).toMatch(EXPECTED_OPTION);
+  const treeTitle = await expect(page).toMatchElement("#Title");
 
-        await waitUntilScreenSteady();
+  await expect(treeTitle).toMatch(option);
 
-        const image = await page.screenshot();
+  await waitUntilScreenStable();
 
-        /**
-         * (tihuan): Apply `blur` to ignore minor noises.
-         * Also `customSnapshotIdentifier` is needed, since we use `jest.retryTimes()`
-         * https://github.com/americanexpress/jest-image-snapshot#%EF%B8%8F-api
-         * https://github.com/americanexpress/jest-image-snapshot/pull/122/files
-         */
-        expect(image).toMatchImageSnapshot({ blur: 2, customSnapshotIdentifier: "Color by: date" });
-      });
-    });
-  });
-});
+  const image = await page.screenshot();
+
+  /**
+   * (tihuan): Apply `blur` to ignore minor noises.
+   * Also `` is needed, since we use `jest.retryTimes()`
+   * https://github.com/americanexpress/jest-image-snapshot/pull/122/files
+   * https://github.com/americanexpress/jest-image-snapshot#%EF%B8%8F-api
+   */
+  expect(image).toMatchImageSnapshot({ blur: 2, customSnapshotIdentifier: `Color by: ${option}` });
+}
 
 async function goToZikaPage() {
   await page.goto(`${BASE_URL}/zika?p=grid`, { waitUntil: "networkidle2" });