Skip to content

Commit

Permalink
Simplify dual tests
Browse files Browse the repository at this point in the history
  • Loading branch information
bluwy committed Oct 7, 2022
1 parent 07533fb commit 0dac3f0
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 35 deletions.
4 changes: 3 additions & 1 deletion tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"private": true,
"type": "module",
"scripts": {
"test": "playwright test"
"test": "pnpm test:dev && pnpm test:build",
"test:dev": "playwright test",
"test:build": "TEST_BUILD=true playwright test"
},
"devDependencies": {
"@playwright/test": "^1.26.1",
Expand Down
21 changes: 5 additions & 16 deletions tests/playground-vite-svelte/playground-vite-svelte.spec.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
import { test, expect } from '@playwright/test'
import { setupDevServer, setupPreviewServer } from '../testUtils.js'
import { setup } from '../testUtils.js'

test.describe('dev', () => {
setupDevServer()
setup()

test('render the page', async ({ page }) => {
await page.goto('/')
expect(await page.locator('h1').textContent()).toBe('Svelte')
})
})

test.describe('build', () => {
setupPreviewServer()

test('render the page', async ({ page }) => {
await page.goto('/')
expect(await page.locator('h1').textContent()).toBe('Svelte')
})
test('render the page', async ({ page }) => {
await page.goto('/')
expect(await page.locator('h1').textContent()).toBe('Svelte')
})
21 changes: 5 additions & 16 deletions tests/playground-vite-vue/playground-vite-vue.spec.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
import { test, expect } from '@playwright/test'
import { setupDevServer, setupPreviewServer } from '../testUtils.js'
import { setup } from '../testUtils.js'

test.describe('dev', () => {
setupDevServer()
setup()

test('render the page', async ({ page }) => {
await page.goto('/')
expect(await page.locator('h1').textContent()).toBe('Vue')
})
})

test.describe('build', () => {
setupPreviewServer()

test('render the page', async ({ page }) => {
await page.goto('/')
expect(await page.locator('h1').textContent()).toBe('Vue')
})
test('render the page', async ({ page }) => {
await page.goto('/')
expect(await page.locator('h1').textContent()).toBe('Vue')
})
15 changes: 13 additions & 2 deletions tests/testUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,18 @@ import treeKill from 'tree-kill'

const killPid = promisify(treeKill)

export function setupDevServer() {
export const isDev = !process.env.TEST_BUILD
export const isBuild = !!process.env.TEST_BUILD

export function setup() {
if (isDev) {
setupDevServer()
} else {
setupPreviewServer()
}
}

function setupDevServer() {
/** @type {import('execa').ExecaChildProcess<string>} */
let cp

Expand All @@ -23,7 +34,7 @@ export function setupDevServer() {
})
}

export function setupPreviewServer() {
function setupPreviewServer() {
/** @type {import('execa').ExecaChildProcess<string>} */
let cp

Expand Down

0 comments on commit 0dac3f0

Please sign in to comment.