Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move e2e tests to their own templates #184

Merged
merged 6 commits into from
Sep 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/content-css-module'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/content-extension-config'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/content-less'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/content-main-world'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/content-preact'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/content-react'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/content-sass-module'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/content-sass'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/content-shadow-dom'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/content-tailwind'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/content-typescript'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/content-vue'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
4 changes: 2 additions & 2 deletions e2e/content.spec.ts → examples/content/template.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/content'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/new-crypto'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
4 changes: 2 additions & 2 deletions e2e/new-less.spec.ts → examples/new-less/template.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/new-less'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/new-preact'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/new-react-router'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
4 changes: 2 additions & 2 deletions e2e/new-react.spec.ts → examples/new-react/template.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/new-react'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
4 changes: 2 additions & 2 deletions e2e/new-sass.spec.ts → examples/new-sass/template.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/new-sass'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/new-tailwind'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/new-typescript'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
4 changes: 2 additions & 2 deletions e2e/new-vue.spec.ts → examples/new-vue/template.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/new-vue'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
4 changes: 2 additions & 2 deletions e2e/new.spec.ts → examples/new/template.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import path from 'path'
import {execSync} from 'child_process'
import {extensionFixtures} from './extension-fixtures'
import {extensionFixtures} from '../extension-fixtures'

const exampleDir = 'examples/new'
const pathToExtension = path.join(__dirname, `../${exampleDir}/dist/chrome`)
const pathToExtension = path.join(__dirname, `dist/chrome`)
const test = extensionFixtures(pathToExtension, true)

test.beforeAll(async () => {
Expand Down
2 changes: 1 addition & 1 deletion playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {defineConfig, devices} from '@playwright/test'
* See https://playwright.dev/docs/test-configuration.
*/
export default defineConfig({
testDir: './e2e',
testDir: './examples',
/* Run tests in files in parallel */
fullyParallel: true,
/* Fail the build on CI if you accidentally left test.only in the source code. */
Expand Down
7 changes: 7 additions & 0 deletions programs/create/lib/messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -289,3 +289,10 @@ export function writingDirectoryError(error: any) {
red(error)
)
}

export function cantSetupBuiltInTests(projectName: string, error: any) {
return (
`${red(`✖︎✖︎✖︎`)} Can't setup built-in tests for ` +
`${cyan(projectName)}:\n${red(error)}`
)
}
2 changes: 2 additions & 0 deletions programs/create/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {writeManifestJson} from './steps/write-manifest-json'
import {generateExtensionTypes} from './steps/generate-extension-types'
import {writeGitignore} from './steps/write-gitignore'
import {initializeGitRepository} from './steps/initialize-git-repository'
import {setupBuiltInTests} from './steps/setup-built-in-tests'

export interface CreateOptions {
template: string
Expand Down Expand Up @@ -55,6 +56,7 @@ export async function extensionCreate(
await writeManifestJson(projectPath, projectName)
await initializeGitRepository(projectPath, projectName)
await writeGitignore(projectPath)
await setupBuiltInTests(projectPath, projectName)

if (utils.isTypeScriptTemplate(template)) {
await generateExtensionTypes(projectPath, projectName)
Expand Down
14 changes: 10 additions & 4 deletions programs/create/steps/import-external-template.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import path from 'path'
import fs from 'fs/promises'
import goGitIt from 'go-git-it'
import * as messages from '../lib/messages'
import * as utils from '../lib/utils'

export async function importExternalTemplate(
projectPath: string,
Expand All @@ -32,11 +33,16 @@ export async function importExternalTemplate(

templatePath = path.join(projectPath, templateName)

await fs.cp(
path.join(__dirname, '..', '..', '..', 'examples', templateName),
templatePath,
{recursive: true}
const localTemplatePath = path.join(
__dirname,
'..',
'..',
'..',
'examples',
templateName
)

await utils.copyDirectory(localTemplatePath, templatePath)
} else {
await goGitIt(
templateUrl,
Expand Down
28 changes: 28 additions & 0 deletions programs/create/steps/setup-built-in-tests.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// ██████╗██████╗ ███████╗ █████╗ ████████╗███████╗
// ██╔════╝██╔══██╗██╔════╝██╔══██╗╚══██╔══╝██╔════╝
// ██║ ██████╔╝█████╗ ███████║ ██║ █████╗
// ██║ ██╔══██╗██╔══╝ ██╔══██║ ██║ ██╔══╝
// ╚██████╗██║ ██║███████╗██║ ██║ ██║ ███████╗
// ╚═════╝╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝ ╚═╝ ╚══════╝

import path from 'path'
import fs from 'fs'
import * as messages from '../lib/messages'

export async function setupBuiltInTests(
projectPath: string,
projectName: string
) {
try {
// Remove the existing test spec templates.spec.ts
const testSpecPath = path.join(projectPath, 'tests', 'templates.spec.ts')

if (fs.existsSync(testSpecPath)) {
fs.unlinkSync(testSpecPath)
}
} catch (error: any) {
console.error(messages.cantSetupBuiltInTests(projectName, error))

process.exit(1)
}
}