From d0eece3d8ff5b3eff7e86752a73e16d85b52ee50 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 4 Feb 2021 14:54:26 -0700
Subject: [PATCH] refactor: add note to test.sh about --home

---
 ci/dev/test.sh      | 3 ++-
 src/common/util.ts  | 4 ++--
 test/goHome.test.ts | 9 ++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ci/dev/test.sh b/ci/dev/test.sh
index 70434db18..6520176db 100755
--- a/ci/dev/test.sh
+++ b/ci/dev/test.sh
@@ -17,7 +17,8 @@ main() {
     echo "  \$PASSWORD"
     echo "  \$CODE_SERVER_ADDRESS"
     echo -e "\n"
-    echo "Please make sure you have code-server running locally."
+    echo "Please make sure you have code-server running locally with the flag:"
+    echo "  --home \$CODE_SERVER_ADDRESS/healthz "
     echo -e "\n"
     exit 1
   fi
diff --git a/src/common/util.ts b/src/common/util.ts
index d0e03ab3c..9b6418da4 100644
--- a/src/common/util.ts
+++ b/src/common/util.ts
@@ -140,8 +140,8 @@ export interface Cookie {
  * Checks if a cookie exists in array of cookies
  */
 export function checkForCookie(cookies: Array<Cookie>, key: string): boolean {
-  // Check for at least one cookie where the name is equal to key
-  return cookies.filter((cookie) => cookie.name === key).length > 0
+  // Check for a cookie where the name is equal to key
+  return Boolean(cookies.find((cookie) => cookie.name === key))
 }
 
 /**
diff --git a/test/goHome.test.ts b/test/goHome.test.ts
index b8646bc38..57712e5ad 100644
--- a/test/goHome.test.ts
+++ b/test/goHome.test.ts
@@ -12,7 +12,6 @@ describe("login", () => {
     // Create a new context with the saved storage state
     const storageState = JSON.parse(process.env.STORAGE || "")
 
-    //
     const cookieToStore = {
       sameSite: "Lax" as const,
       name: "key",
@@ -61,16 +60,20 @@ describe("login", () => {
 
   // NOTE: this test will fail if you do not run code-server with --home $CODE_SERVER_ADDRESS/healthz
   it("should see a 'Go Home' button in the Application Menu that goes to /healthz", async (done) => {
+    let requestedGoHomeUrl = false
     // Ideally, this test should pass and finish before the timeout set in the Jest config
     // However, if it doesn't, we don't want a memory leak so we set this backup timeout
     // Otherwise Jest may throw this error
     // "Jest did not exit one second after the test run has completed.
     // This usually means that there are asynchronous operations that weren't stopped in your tests.
     // Consider running Jest with `--detectOpenHandles` to troubleshoot this issue."
-    const backupTimeout = setTimeout(() => done(), 20000)
+    const backupTimeout = setTimeout(() => {
+      // If it's not true by this point then the test should fail
+      expect(requestedGoHomeUrl).toBeTruthy()
+      done()
+    }, 20000)
 
     const GO_HOME_URL = `${process.env.CODE_SERVER_ADDRESS}/healthz`
-    let requestedGoHomeUrl = false
     page.on("request", (request) => {
       // This ensures that we did make a request to the GO_HOME_URL
       // Most reliable way to test button