📦 Upgrade packages

apps/viewer/playwright/.env.example

@@ -1,4 +0,0 @@
-VIEWER_URL=http://localhost:3001
-BUILDER_URL=http://localhost:3000
-DATABASE_URL=postgresql://postgres:typebot@localhost:5432/typebot
-ENCRYPTION_SECRET=SgVkYp2s5v8y/B?E(H+MbQeThWmZq4t6 #256-bits secret (can be generated here: https://www.allkeysgenerator.com/Random/Security-Encryption-Key-Generator.aspx)

apps/viewer/playwright/global-setup.ts

@@ -1,11 +0,0 @@
-import { FullConfig } from '@playwright/test'
-import { setupDatabase, teardownDatabase } from 'utils/playwright/databaseSetup'
-
-async function globalSetup(config: FullConfig) {
-  const { baseURL } = config.projects[0].use
-  if (!baseURL) throw new Error('baseURL is missing')
-  await teardownDatabase()
-  await setupDatabase()
-}
-
-export default globalSetup

apps/viewer/playwright/services/databaseActions.ts

@@ -1,7 +1,7 @@
 import { CredentialsType, SmtpCredentialsData } from 'models'
 import { PrismaClient } from 'db'
 import { encrypt } from 'utils/api'
-import { freeWorkspaceId } from 'utils/playwright/databaseSetup'
+import { proWorkspaceId } from 'utils/playwright/databaseSetup'
 
 const prisma = new PrismaClient()
 
@@ -17,7 +17,7 @@ export const createSmtpCredentials = (
       iv,
       name: smtpData.from.email as string,
       type: CredentialsType.SMTP,
-      workspaceId: freeWorkspaceId,
+      workspaceId: proWorkspaceId,
     },
   })
 }

apps/viewer/playwright/tests/fileUpload.spec.ts

@@ -28,7 +28,7 @@ test('should work as expected', async ({ page, browser }) => {
   await expect(
     typebotViewer(page).locator(`text="3 files uploaded"`)
   ).toBeVisible()
-  await page.goto(`${process.env.BUILDER_URL}/typebots/${typebotId}/results`)
+  await page.goto(`${process.env.NEXTAUTH_URL}/typebots/${typebotId}/results`)
   await expect(page.locator('text="api.json"')).toHaveAttribute(
     'href',
     /.+\/api\.json/
@@ -52,7 +52,7 @@ test('should work as expected', async ({ page, browser }) => {
   const file = readFileSync(downloadPath as string).toString()
   const { data } = parse(file)
   expect(data).toHaveLength(2)
-  expect((data[1] as unknown[])[1]).toContain('http://localhost:9000')
+  expect((data[1] as unknown[])[1]).toContain(process.env.S3_ENDPOINT)
 
   const urls = (
     await Promise.all(
@@ -72,17 +72,7 @@ test('should work as expected', async ({ page, browser }) => {
   await page.locator('button >> text="Delete" >> nth=1').click()
   await expect(page.locator('text="api.json"')).toBeHidden()
   await page2.goto(urls[0])
-  await expect(
-    page2.locator('span:has-text("The specified key does not exist.")')
-  ).toBeVisible()
-  await page2.goto(urls[1])
-  await expect(
-    page2.locator('span:has-text("The specified key does not exist.")')
-  ).toBeVisible()
-  await page2.goto(urls[2])
-  await expect(
-    page2.locator('span:has-text("The specified key does not exist.")')
-  ).toBeVisible()
+  await expect(page2.locator('pre')).toBeHidden()
 })
 
 // TODO: uncomment on 1st of November
@@ -124,7 +114,7 @@ test('should work as expected', async ({ page, browser }) => {
 //     await page.evaluate(() =>
 //       window.localStorage.setItem('workspaceId', 'starterWorkspace')
 //     )
-//     await page.goto(`${process.env.BUILDER_URL}/typebots/${typebotId}/results`)
+//     await page.goto(`${process.env.NEXTAUTH_URL}/typebots/${typebotId}/results`)
 //     await expect(page.locator('text="150%"')).toBeVisible()
 //     await expect(page.locator('text="api.json"')).toBeHidden()
 //   })

apps/viewer/playwright/tests/hugeBlock.spec.ts

@@ -16,7 +16,7 @@ test('should work as expected', async ({ page }) => {
   await typebotViewer(page).locator('input').fill('26')
   await typebotViewer(page).locator('input').press('Enter')
   await typebotViewer(page).locator('button >> text=Yes').click()
-  await page.goto(`${process.env.BUILDER_URL}/typebots/${typebotId}/results`)
+  await page.goto(`${process.env.NEXTAUTH_URL}/typebots/${typebotId}/results`)
   await expect(page.locator('text="Baptiste"')).toBeVisible()
   await expect(page.locator('text="26"')).toBeVisible()
   await expect(page.locator('text="Yes"')).toBeVisible()

apps/viewer/playwright/tests/sendEmail.spec.ts

@@ -17,10 +17,17 @@ const mockSmtpCredentials: SmtpCredentialsData = {
   password: 'yXZChpPy25Qa5yBbeH',
 }
 
+test.beforeAll(async () => {
+  try {
+    const credentialsId = 'send-email-credentials'
+    await createSmtpCredentials(credentialsId, mockSmtpCredentials)
+  } catch (err) {
+    console.error(err)
+  }
+})
+
 test('should send an email', async ({ page }) => {
   const typebotId = cuid()
-  const credentialsId = 'send-email-credentials'
-  await createSmtpCredentials(credentialsId, mockSmtpCredentials)
   await importTypebotInDatabase(
     path.join(__dirname, '../fixtures/typebots/sendEmail.json'),
     { id: typebotId, publicId: `${typebotId}-public` }
@@ -41,7 +48,7 @@ test('should send an email', async ({ page }) => {
   await expect(
     page.locator('text="<baptiste.arnaud95@gmail.com>" >> nth=0')
   ).toBeVisible()
-  await page.goto(`${process.env.BUILDER_URL}/typebots/${typebotId}/results`)
+  await page.goto(`${process.env.NEXTAUTH_URL}/typebots/${typebotId}/results`)
   await page.click('text="See logs"')
   await expect(page.locator('text="Email successfully sent"')).toBeVisible()
 })

apps/viewer/playwright/tests/typebotLink.spec.ts

@@ -3,18 +3,25 @@ import path from 'path'
 import { importTypebotInDatabase } from 'utils/playwright/databaseActions'
 import { typebotViewer } from 'utils/playwright/testHelpers'
 
-test('should work as expected', async ({ page }) => {
-  const typebotId = 'cl0ibhi7s0018n21aarlmg0cm'
-  const linkedTypebotId = 'cl0ibhv8d0130n21aw8doxhj5'
-  await importTypebotInDatabase(
-    path.join(__dirname, '../fixtures/typebots/linkTypebots/1.json'),
-    { id: typebotId, publicId: `${typebotId}-public` }
-  )
-  await importTypebotInDatabase(
-    path.join(__dirname, '../fixtures/typebots/linkTypebots/2.json'),
-    { id: linkedTypebotId, publicId: `${linkedTypebotId}-public` }
-  )
+const typebotId = 'cl0ibhi7s0018n21aarlmg0cm'
+const linkedTypebotId = 'cl0ibhv8d0130n21aw8doxhj5'
 
+test.beforeAll(async () => {
+  try {
+    await importTypebotInDatabase(
+      path.join(__dirname, '../fixtures/typebots/linkTypebots/1.json'),
+      { id: typebotId, publicId: `${typebotId}-public` }
+    )
+    await importTypebotInDatabase(
+      path.join(__dirname, '../fixtures/typebots/linkTypebots/2.json'),
+      { id: linkedTypebotId, publicId: `${linkedTypebotId}-public` }
+    )
+  } catch (err) {
+    console.error(err)
+  }
+})
+
+test('should work as expected', async ({ page }) => {
   await page.goto(`/${typebotId}-public`)
   await typebotViewer(page).locator('input').fill('Hello there!')
   await Promise.all([
@@ -26,6 +33,6 @@ test('should work as expected', async ({ page }) => {
     ),
     typebotViewer(page).locator('input').press('Enter'),
   ])
-  await page.goto(`${process.env.BUILDER_URL}/typebots/${typebotId}/results`)
+  await page.goto(`${process.env.NEXTAUTH_URL}/typebots/${typebotId}/results`)
   await expect(page.locator('text=Hello there!')).toBeVisible()
 })

apps/viewer/playwright/tests/webhook.spec.ts

@@ -4,12 +4,15 @@ import path from 'path'
 import { HttpMethod } from 'models'
 import {
   createWebhook,
+  deleteTypebots,
+  deleteWebhooks,
   importTypebotInDatabase,
 } from 'utils/playwright/databaseActions'
 import { typebotViewer } from 'utils/playwright/testHelpers'
 
-test('should execute webhooks properly', async ({ page }) => {
-  const typebotId = cuid()
+const typebotId = cuid()
+
+test.beforeEach(async () => {
   await importTypebotInDatabase(
     path.join(__dirname, '../fixtures/typebots/webhook.json'),
     { id: typebotId, publicId: `${typebotId}-public` }
@@ -38,7 +41,18 @@ test('should execute webhooks properly', async ({ page }) => {
     method: HttpMethod.POST,
     body: `{{Full body}}`,
   })
+})
 
+test.afterEach(async () => {
+  await deleteTypebots([typebotId])
+  await deleteWebhooks([
+    'failing-webhook',
+    'partial-body-webhook',
+    'full-body-webhook',
+  ])
+})
+
+test('should execute webhooks properly', async ({ page }) => {
   await page.goto(`/${typebotId}-public`)
   await typebotViewer(page).locator('text=Send failing webhook').click()
   await typebotViewer(page)