OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

refactor: add note to test.sh about --home

Browse Source
This commit is contained in:
Joe Previte 2021-02-04 14:54:26 -07:00
parent 2dc56ad4d7
commit d0eece3d8f
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ci/dev/test.sh
View File

@ -17,7 +17,8 @@ main() {
echo " \$PASSWORD" echo " \$PASSWORD"
echo " \$CODE_SERVER_ADDRESS" echo " \$CODE_SERVER_ADDRESS"
echo -e "\n" 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" echo -e "\n"
exit 1 exit 1
fi fi

4
src/common/util.ts
View File

@ -140,8 +140,8 @@ export interface Cookie {
* Checks if a cookie exists in array of cookies * Checks if a cookie exists in array of cookies
*/ */
export function checkForCookie(cookies: Array<Cookie>, key: string): boolean { export function checkForCookie(cookies: Array<Cookie>, key: string): boolean {
// Check for at least one cookie where the name is equal to key // Check for a cookie where the name is equal to key
return cookies.filter((cookie) => cookie.name === key).length > 0 return Boolean(cookies.find((cookie) => cookie.name === key))
} }
/** /**

9
test/goHome.test.ts
View File

@ -12,7 +12,6 @@ describe("login", () => {
// Create a new context with the saved storage state // Create a new context with the saved storage state
const storageState = JSON.parse(process.env.STORAGE || "") const storageState = JSON.parse(process.env.STORAGE || "")
//
const cookieToStore = { const cookieToStore = {
sameSite: "Lax" as const, sameSite: "Lax" as const,
name: "key", 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 // 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) => { 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 // 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 // However, if it doesn't, we don't want a memory leak so we set this backup timeout
// Otherwise Jest may throw this error // Otherwise Jest may throw this error
// "Jest did not exit one second after the test run has completed. // "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. // This usually means that there are asynchronous operations that weren't stopped in your tests.
// Consider running Jest with `--detectOpenHandles` to troubleshoot this issue." // 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` const GO_HOME_URL = `${process.env.CODE_SERVER_ADDRESS}/healthz`
let requestedGoHomeUrl = false
page.on("request", (request) => { page.on("request", (request) => {
// This ensures that we did make a request to the GO_HOME_URL // This ensures that we did make a request to the GO_HOME_URL
// Most reliable way to test button // Most reliable way to test button