From 2b0c4692babbe7c9a76f144b4e2f40941b14800e Mon Sep 17 00:00:00 2001
From: Timmy Huang <tihuan@users.noreply.github.com>
Date: Tue, 30 Jun 2020 21:27:38 -0700
Subject: [PATCH] e2e-add-more-logs (#1598)

---
 .github/workflows/push_tests.yml        |  2 +-
 client/__tests__/e2e/puppeteer.setup.js |  4 +++-
 client/__tests__/e2e/screenshot_env.js  | 14 +++++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/push_tests.yml b/.github/workflows/push_tests.yml
index 8b5ba39e..8324af42 100644
--- a/.github/workflows/push_tests.yml
+++ b/.github/workflows/push_tests.yml
@@ -72,7 +72,7 @@ jobs:
           cd client && ./node_modules/codecov/bin/codecov --yml=../.codecov.yml --root=../ --gcov-root=../ -C -F frontend,javascript,unitTest
 
   smoke-tests:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.7
diff --git a/client/__tests__/e2e/puppeteer.setup.js b/client/__tests__/e2e/puppeteer.setup.js
index 5fb28ec5..40453777 100644
--- a/client/__tests__/e2e/puppeteer.setup.js
+++ b/client/__tests__/e2e/puppeteer.setup.js
@@ -53,4 +53,6 @@ jest.retryTimes(ENV_DEFAULT.RETRY_ATTEMPTS);
       }
     }
   });
-})();
+})().catch((error) => {
+  console.error("puppeteer.setup.js error", error);
+});
diff --git a/client/__tests__/e2e/screenshot_env.js b/client/__tests__/e2e/screenshot_env.js
index 32dc4c1a..4701d8ca 100644
--- a/client/__tests__/e2e/screenshot_env.js
+++ b/client/__tests__/e2e/screenshot_env.js
@@ -6,11 +6,21 @@ const takeScreenshot = require("./takeScreenshot");
 
 class ScreenshotEnvironment extends PuppeteerEnvironment {
   async handleTestEvent(event, state) {
+    if (["test_start", "test_done"].includes(event.name)) {
+      console.log("------------------event name:\n", event.name);
+      console.log("~~~~ Current test errors\n", new Date(), event.test.errors);
+      console.log("~~~~ Current test\n", new Date(), event.test);
+    }
+
     if (event.name === "error") {
-      console.log("error", JSON.stringify(event));
+      console.log("error event:", JSON.stringify(event));
     }
 
     if (event.name === "test_fn_failure" || event.name === "hook_failure") {
+      console.log("------------------event name:\n", event.name);
+      console.log(">>>> Current state\n", new Date(), state);
+      console.log("===> Failure event\n", new Date(), event);
+
       // (thuang): We only want to take screenshot on the last try
       if (
         state.currentlyRunningTest.invocations <= ENV_DEFAULT.RETRY_ATTEMPTS
@@ -18,8 +28,6 @@ class ScreenshotEnvironment extends PuppeteerEnvironment {
         return;
       }
 
-      console.log("===> Failure event\n", new Date(), event);
-
       await takeScreenshot(state.currentlyRunningTest.name, this.global.page);
     }
   }