refactor: e2e tests based on jest-playwright

This commit is contained in:
Joe Previte 2021-04-01 10:57:44 -07:00
parent 1782f2a239
commit 4b703cbd4d
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
4 changed files with 18 additions and 66 deletions

View File

@ -1,36 +1,20 @@
import { chromium, Page, Browser, BrowserContext } from "playwright" /// <reference types="jest-playwright-preset" />
import { CODE_SERVER_ADDRESS, PASSWORD } from "../utils/constants" import { CODE_SERVER_ADDRESS, PASSWORD } from "../utils/constants"
describe("login", () => { describe("login", () => {
let browser: Browser
let page: Page
let context: BrowserContext
beforeAll(async () => {
browser = await chromium.launch()
context = await browser.newContext()
})
afterAll(async () => {
await browser.close()
})
beforeEach(async () => { beforeEach(async () => {
page = await context.newPage() await jestPlaywright.resetContext()
}) await page.goto(CODE_SERVER_ADDRESS)
afterEach(async () => {
await page.close()
// Remove password from local storage
await context.clearCookies()
}) })
it("should be able to login", async () => { it("should be able to login", async () => {
await page.goto(CODE_SERVER_ADDRESS)
// Type in password // Type in password
await page.fill(".password", PASSWORD) await page.fill(".password", PASSWORD)
// Click the submit button and login // Click the submit button and login
await page.click(".submit") await page.click(".submit")
// For some reason, it wasn't waiting for the click and navigation before checking
// so adding a timeout ensures that we allow the editor time to load
await page.waitForTimeout(1000)
// See the editor // See the editor
const codeServerEditor = await page.isVisible(".monaco-workbench") const codeServerEditor = await page.isVisible(".monaco-workbench")
expect(codeServerEditor).toBeTruthy() expect(codeServerEditor).toBeTruthy()

View File

@ -1,28 +1,9 @@
import { chromium, Page, Browser, BrowserContext } from "playwright" /// <reference types="jest-playwright-preset" />
import { CODE_SERVER_ADDRESS, PASSWORD } from "../utils/constants" import { CODE_SERVER_ADDRESS, PASSWORD } from "../utils/constants"
describe("logout", () => { describe("logout", () => {
let browser: Browser
let page: Page
let context: BrowserContext
beforeAll(async () => {
browser = await chromium.launch()
context = await browser.newContext()
})
afterAll(async () => {
await browser.close()
})
beforeEach(async () => { beforeEach(async () => {
page = await context.newPage() await jestPlaywright.resetContext()
})
afterEach(async () => {
await page.close()
// Remove password from local storage
await context.clearCookies()
}) })
it("should be able login and logout", async () => { it("should be able login and logout", async () => {
@ -31,6 +12,8 @@ describe("logout", () => {
await page.fill(".password", PASSWORD) await page.fill(".password", PASSWORD)
// Click the submit button and login // Click the submit button and login
await page.click(".submit") await page.click(".submit")
// Allow time to navigate
await page.waitForTimeout(1000)
// See the editor // See the editor
const codeServerEditor = await page.isVisible(".monaco-workbench") const codeServerEditor = await page.isVisible(".monaco-workbench")
expect(codeServerEditor).toBeTruthy() expect(codeServerEditor).toBeTruthy()

View File

@ -1,15 +1,11 @@
import { chromium, Page, Browser, BrowserContext, Cookie } from "playwright" /// <reference types="jest-playwright-preset" />
import { Cookie } from "playwright"
import { hash } from "../../src/node/util" import { hash } from "../../src/node/util"
import { CODE_SERVER_ADDRESS, PASSWORD, STORAGE } from "../utils/constants" import { CODE_SERVER_ADDRESS, PASSWORD, STORAGE } from "../utils/constants"
import { createCookieIfDoesntExist } from "../utils/helpers" import { createCookieIfDoesntExist } from "../utils/helpers"
describe("Open Help > About", () => { describe("Open Help > About", () => {
let browser: Browser beforeEach(async () => {
let page: Page
let context: BrowserContext
beforeAll(async () => {
browser = await chromium.launch()
// Create a new context with the saved storage state // Create a new context with the saved storage state
const storageState = JSON.parse(STORAGE) || {} const storageState = JSON.parse(STORAGE) || {}
@ -42,22 +38,7 @@ describe("Open Help > About", () => {
// See discussion: https://github.com/cdr/code-server/pull/2648#discussion_r575434946 // See discussion: https://github.com/cdr/code-server/pull/2648#discussion_r575434946
const maybeUpdatedCookies = createCookieIfDoesntExist(cookies, cookieToStore) const maybeUpdatedCookies = createCookieIfDoesntExist(cookies, cookieToStore)
await jestPlaywright.resetBrowser({ storageState: { cookies: maybeUpdatedCookies } })
context = await browser.newContext({
storageState: { cookies: maybeUpdatedCookies },
})
})
afterAll(async () => {
// Remove password from local storage
await context.clearCookies()
await context.close()
await browser.close()
})
beforeEach(async () => {
page = await context.newPage()
}) })
it("should see a 'Help' then 'About' button in the Application Menu that opens a dialog", async () => { it("should see a 'Help' then 'About' button in the Application Menu that opens a dialog", async () => {

View File

@ -21,6 +21,10 @@ module.exports = async () => {
await page.fill(".password", PASSWORD) await page.fill(".password", PASSWORD)
// Click the submit button and login // Click the submit button and login
await page.click(".submit") await page.click(".submit")
// After logging in, we store a cookie in localStorage
// we need to wait a bit to make sure that happens
// before we grab the storage and save it
await page.waitForTimeout(1000)
// Save storage state and store as an env variable // Save storage state and store as an env variable
// More info: https://playwright.dev/docs/auth?_highlight=authe#reuse-authentication-state // More info: https://playwright.dev/docs/auth?_highlight=authe#reuse-authentication-state