refactor(graph): ♻️ Add Edges table in Typebot

apps/builder/cypress/tests/inputs.ts

@@ -1,261 +0,0 @@
-import { createTypebotWithStep } from 'cypress/plugins/data'
-import { preventUserFromRefreshing } from 'cypress/plugins/utils'
-import { getIframeBody } from 'cypress/support'
-import { InputStepType } from 'models'
-
-describe('Text input', () => {
-  beforeEach(() => {
-    cy.task('seed')
-    createTypebotWithStep({ type: InputStepType.TEXT })
-    cy.signOut()
-  })
-
-  afterEach(() => {
-    cy.window().then((win) => {
-      win.removeEventListener('beforeunload', preventUserFromRefreshing)
-    })
-  })
-
-  it('options should work', () => {
-    cy.signIn('test2@gmail.com')
-    cy.visit('/typebots/typebot3/edit')
-    cy.findByRole('button', { name: 'Preview' }).click()
-    getIframeBody()
-      .findByPlaceholderText('Type your answer...')
-      .should('have.attr', 'type')
-      .should('equal', 'text')
-    getIframeBody().findByRole('button', { name: 'Send' }).should('be.disabled')
-    cy.findByTestId('step-step1').click({ force: true })
-    cy.findByRole('textbox', { name: 'Placeholder:' })
-      .clear()
-      .type('Your name...')
-    cy.findByRole('textbox', { name: 'Button label:' }).clear().type('Go')
-    cy.findByRole('button', { name: 'Restart' }).click()
-    cy.findByTestId('step-step1').should('contain.text', 'Your name...')
-    getIframeBody().findByPlaceholderText('Your name...').should('exist')
-    getIframeBody().findByRole('button', { name: 'Go' })
-    cy.findByTestId('step-step1').click({ force: true })
-    cy.findByRole('checkbox', { name: 'Long text?' }).check({ force: true })
-    cy.findByRole('button', { name: 'Restart' }).click()
-    getIframeBody().findByTestId('textarea').should('exist')
-  })
-})
-
-describe('Number input', () => {
-  beforeEach(() => {
-    cy.task('seed')
-    createTypebotWithStep({ type: InputStepType.NUMBER })
-    cy.signOut()
-  })
-
-  it('options should work', () => {
-    cy.signIn('test2@gmail.com')
-    cy.visit('/typebots/typebot3/edit')
-    cy.findByRole('button', { name: 'Preview' }).click()
-    getIframeBody()
-      .findByPlaceholderText('Type your answer...')
-      .should('have.attr', 'type')
-      .should('equal', 'number')
-    getIframeBody().findByRole('button', { name: 'Send' }).should('be.disabled')
-    cy.findByTestId('step-step1').click({ force: true })
-    cy.findByRole('textbox', { name: 'Placeholder:' })
-      .clear()
-      .type('Your name...')
-    cy.findByRole('textbox', { name: 'Button label:' }).clear().type('Go')
-    cy.findByRole('spinbutton', { name: 'Min:' }).type('0')
-    cy.findByRole('spinbutton', { name: 'Max:' }).type('100')
-    cy.findByRole('spinbutton', { name: 'Step:' }).type('10')
-    cy.findByRole('button', { name: 'Restart' }).click()
-    cy.findByTestId('step-step1').should('contain.text', 'Your name...')
-    getIframeBody()
-      .findByPlaceholderText('Your name...')
-      .should('exist')
-      .type('-1{enter}')
-      .clear()
-      .type('150{enter}')
-    getIframeBody().findByRole('button', { name: 'Go' })
-    cy.findByTestId('step-step1').click({ force: true })
-  })
-})
-
-describe('Email input', () => {
-  beforeEach(() => {
-    cy.task('seed')
-    createTypebotWithStep({ type: InputStepType.EMAIL })
-    cy.signOut()
-  })
-
-  it('options should work', () => {
-    cy.signIn('test2@gmail.com')
-    cy.visit('/typebots/typebot3/edit')
-    cy.findByRole('button', { name: 'Preview' }).click()
-    getIframeBody()
-      .findByPlaceholderText('Type your email...')
-      .should('have.attr', 'type')
-      .should('equal', 'email')
-    getIframeBody().findByRole('button', { name: 'Send' })
-    getIframeBody().findByPlaceholderText('Type your email...').should('exist')
-    getIframeBody().findByRole('button', { name: 'Send' }).should('be.disabled')
-    cy.findByTestId('step-step1').click({ force: true })
-    cy.findByRole('textbox', { name: 'Placeholder:' })
-      .clear()
-      .type('Your email...')
-    cy.findByRole('textbox', { name: 'Button label:' }).clear().type('Go')
-    cy.findByTestId('step-step1').should('contain.text', 'Your email...')
-    cy.findByRole('button', { name: 'Restart' }).click()
-    getIframeBody().findByPlaceholderText('Your email...').should('exist')
-    getIframeBody().findByRole('button', { name: 'Go' })
-  })
-})
-
-describe('URL input', () => {
-  beforeEach(() => {
-    cy.task('seed')
-    createTypebotWithStep({ type: InputStepType.URL })
-    cy.signOut()
-  })
-
-  it('options should work', () => {
-    cy.signIn('test2@gmail.com')
-    cy.visit('/typebots/typebot3/edit')
-    cy.findByRole('button', { name: 'Preview' }).click()
-    getIframeBody()
-      .findByPlaceholderText('Type your URL...')
-      .should('have.attr', 'type')
-      .should('eq', 'url')
-    getIframeBody().findByRole('button', { name: 'Send' }).should('be.disabled')
-    cy.findByTestId('step-step1').click({ force: true })
-    cy.findByRole('textbox', { name: 'Placeholder:' })
-      .clear()
-      .type('Your URL...')
-    cy.findByRole('textbox', { name: 'Button label:' }).clear().type('Go')
-    cy.findByTestId('step-step1').should('contain.text', 'Your URL...')
-    cy.findByRole('button', { name: 'Restart' }).click()
-    getIframeBody().findByPlaceholderText('Your URL...').should('exist')
-    getIframeBody().findByRole('button', { name: 'Go' })
-  })
-})
-
-describe('Date input', () => {
-  beforeEach(() => {
-    cy.task('seed')
-    createTypebotWithStep({ type: InputStepType.DATE })
-    cy.signOut()
-  })
-
-  it('options should work', () => {
-    cy.signIn('test2@gmail.com')
-    cy.visit('/typebots/typebot3/edit')
-    cy.findByRole('button', { name: 'Preview' }).click()
-    getIframeBody()
-      .findByTestId('from-date')
-      .should('have.attr', 'type')
-      .should('eq', 'date')
-    getIframeBody().findByRole('button', { name: 'Send' }).should('be.disabled')
-    cy.findByTestId('step-step1').click({ force: true })
-    cy.findByRole('checkbox', { name: 'Is range?' }).check({ force: true })
-    cy.findByRole('textbox', { name: 'From label:' }).clear().type('Previous:')
-    cy.findByRole('textbox', { name: 'To label:' }).clear().type('After:')
-    cy.findByRole('checkbox', { name: 'With time?' }).check({ force: true })
-    cy.findByRole('textbox', { name: 'Button label:' }).clear().type('Go')
-    cy.findByRole('button', { name: 'Restart' }).click()
-    getIframeBody()
-      .findByTestId('from-date')
-      .should('have.attr', 'type')
-      .should('eq', 'datetime-local')
-    getIframeBody()
-      .findByTestId('to-date')
-      .should('have.attr', 'type')
-      .should('eq', 'datetime-local')
-    getIframeBody().findByRole('button', { name: 'Go' })
-  })
-})
-
-describe('Phone number input', () => {
-  beforeEach(() => {
-    cy.task('seed')
-    createTypebotWithStep({ type: InputStepType.PHONE })
-    cy.signOut()
-  })
-
-  it('options should work', () => {
-    cy.signIn('test2@gmail.com')
-    cy.visit('/typebots/typebot3/edit')
-    cy.findByRole('button', { name: 'Preview' }).click()
-    getIframeBody()
-      .findByPlaceholderText('Your phone number...')
-      .should('have.attr', 'type')
-      .should('eq', 'tel')
-    getIframeBody().findByRole('button', { name: 'Send' }).should('be.disabled')
-    cy.findByTestId('step-step1').click({ force: true })
-    cy.findByRole('textbox', { name: 'Placeholder:' })
-      .clear()
-      .type('+33 XX XX XX XX')
-    cy.findByRole('textbox', { name: 'Button label:' }).clear().type('Go')
-    cy.findByRole('button', { name: 'Restart' }).click()
-    getIframeBody()
-      .findByPlaceholderText('+33 XX XX XX XX')
-      .type('+33 6 73 18 45 36')
-    getIframeBody()
-      .findByRole('img')
-      .should('have.attr', 'alt')
-      .should('eq', 'France')
-    getIframeBody().findByRole('button', { name: 'Go' }).click()
-    getIframeBody().findByText('+33673184536').should('exist')
-  })
-})
-
-describe('Button input', () => {
-  beforeEach(() => {
-    cy.task('seed')
-    createTypebotWithStep({ type: InputStepType.CHOICE })
-    cy.signOut()
-  })
-
-  it('Can edit choice items', () => {
-    cy.signIn('test2@gmail.com')
-    cy.visit('/typebots/typebot3/edit')
-    cy.findByDisplayValue('Click to edit').type('Item 1{enter}')
-    cy.findByText('Item 1').trigger('mouseover')
-    cy.findByRole('button', { name: 'Add item' }).click()
-    cy.findByDisplayValue('Click to edit').type('Item 2{enter}')
-    cy.findByRole('button', { name: 'Add item' }).click()
-    cy.findByDisplayValue('Click to edit').type('Item 3{enter}')
-    cy.findByText('Item 2').rightclick()
-    cy.findByRole('menuitem', { name: 'Delete' }).click()
-    cy.findByText('Item 2').should('not.exist')
-    cy.findByTestId('step-step1').click({ force: true })
-    cy.findByRole('button', { name: 'Preview' }).click()
-    getIframeBody().findByRole('button', { name: 'Item 3' }).click()
-    getIframeBody().findByRole('button', { name: 'Item 3' }).should('not.exist')
-    getIframeBody().findByText('Item 3')
-    cy.findByRole('button', { name: 'Close' }).click()
-    cy.findByTestId('step-step1').click({ force: true })
-    cy.findByRole('checkbox', { name: 'Multiple choice?' }).check({
-      force: true,
-    })
-    cy.findByRole('textbox', { name: 'Button label:' }).clear().type('Go')
-    cy.wait(200)
-    cy.findByTestId('step-step1').click({ force: true })
-    cy.findByText('Item 1').trigger('mouseover')
-    cy.findByRole('button', { name: 'Add item' }).click()
-    cy.findByDisplayValue('Click to edit').type('Item 2{enter}')
-    cy.findByRole('button', { name: 'Preview' }).click()
-    getIframeBody().findByRole('checkbox', { name: 'Item 3' }).click()
-    getIframeBody().findByRole('checkbox', { name: 'Item 1' }).click()
-    getIframeBody().findByRole('button', { name: 'Go' }).click()
-    getIframeBody().findByText('Item 3, Item 1').should('exist')
-  })
-
-  it('Single choice targets should work', () => {
-    cy.loadTypebotFixtureInDatabase('typebots/singleChoiceTarget.json')
-    cy.signIn('test2@gmail.com')
-    cy.visit('/typebots/typebot4/edit')
-    cy.findByRole('button', { name: 'Preview' }).click()
-    getIframeBody().findByRole('button', { name: 'Burgers' }).click()
-    getIframeBody().findByText('I love burgers!').should('exist')
-    cy.findByRole('button', { name: 'Restart' }).click()
-    getIframeBody().findByRole('button', { name: 'Carpaccio' }).click()
-    getIframeBody().findByText('Cool!').should('exist')
-  })
-})

apps/builder/cypress/tests/inputs/button.ts

@@ -0,0 +1,58 @@
+import { createTypebotWithStep } from 'cypress/plugins/data'
+import { getIframeBody } from 'cypress/support'
+import { InputStepType } from 'models'
+
+describe('Button input', () => {
+  beforeEach(() => {
+    cy.task('seed')
+    createTypebotWithStep({ type: InputStepType.CHOICE })
+    cy.signOut()
+  })
+
+  it('Can edit choice items', () => {
+    cy.signIn('test2@gmail.com')
+    cy.visit('/typebots/typebot3/edit')
+    cy.findByDisplayValue('Click to edit').type('Item 1{enter}')
+    cy.findByText('Item 1').trigger('mouseover')
+    cy.findByRole('button', { name: 'Add item' }).click()
+    cy.findByDisplayValue('Click to edit').type('Item 2{enter}')
+    cy.findByRole('button', { name: 'Add item' }).click()
+    cy.findByDisplayValue('Click to edit').type('Item 3{enter}')
+    cy.findByText('Item 2').rightclick()
+    cy.findByRole('menuitem', { name: 'Delete' }).click()
+    cy.findByText('Item 2').should('not.exist')
+    cy.findByTestId('step-step1').click({ force: true })
+    cy.findByRole('button', { name: 'Preview' }).click()
+    getIframeBody().findByRole('button', { name: 'Item 3' }).click()
+    getIframeBody().findByRole('button', { name: 'Item 3' }).should('not.exist')
+    getIframeBody().findByText('Item 3')
+    cy.findByRole('button', { name: 'Close' }).click()
+    cy.findByTestId('step-step1').click({ force: true })
+    cy.findByRole('checkbox', { name: 'Multiple choice?' }).check({
+      force: true,
+    })
+    cy.findByRole('textbox', { name: 'Button label:' }).clear().type('Go')
+    cy.wait(200)
+    cy.findByTestId('step-step1').click({ force: true })
+    cy.findByText('Item 1').trigger('mouseover')
+    cy.findByRole('button', { name: 'Add item' }).click()
+    cy.findByDisplayValue('Click to edit').type('Item 2{enter}')
+    cy.findByRole('button', { name: 'Preview' }).click()
+    getIframeBody().findByRole('checkbox', { name: 'Item 3' }).click()
+    getIframeBody().findByRole('checkbox', { name: 'Item 1' }).click()
+    getIframeBody().findByRole('button', { name: 'Go' }).click()
+    getIframeBody().findByText('Item 3, Item 1').should('exist')
+  })
+
+  it('Single choice targets should work', () => {
+    cy.loadTypebotFixtureInDatabase('typebots/singleChoiceTarget.json')
+    cy.signIn('test2@gmail.com')
+    cy.visit('/typebots/typebot4/edit')
+    cy.findByRole('button', { name: 'Preview' }).click()
+    getIframeBody().findByRole('button', { name: 'Burgers' }).click()
+    getIframeBody().findByText('I love burgers!').should('exist')
+    cy.findByRole('button', { name: 'Restart' }).click()
+    getIframeBody().findByRole('button', { name: 'Carpaccio' }).click()
+    getIframeBody().findByText('Cool!').should('exist')
+  })
+})

apps/builder/cypress/tests/inputs/date.ts

@@ -0,0 +1,38 @@
+import { createTypebotWithStep } from 'cypress/plugins/data'
+import { getIframeBody } from 'cypress/support'
+import { InputStepType } from 'models'
+
+describe('Date input', () => {
+  beforeEach(() => {
+    cy.task('seed')
+    createTypebotWithStep({ type: InputStepType.DATE })
+    cy.signOut()
+  })
+
+  it('options should work', () => {
+    cy.signIn('test2@gmail.com')
+    cy.visit('/typebots/typebot3/edit')
+    cy.findByRole('button', { name: 'Preview' }).click()
+    getIframeBody()
+      .findByTestId('from-date')
+      .should('have.attr', 'type')
+      .should('eq', 'date')
+    getIframeBody().findByRole('button', { name: 'Send' }).should('be.disabled')
+    cy.findByTestId('step-step1').click({ force: true })
+    cy.findByRole('checkbox', { name: 'Is range?' }).check({ force: true })
+    cy.findByRole('textbox', { name: 'From label:' }).clear().type('Previous:')
+    cy.findByRole('textbox', { name: 'To label:' }).clear().type('After:')
+    cy.findByRole('checkbox', { name: 'With time?' }).check({ force: true })
+    cy.findByRole('textbox', { name: 'Button label:' }).clear().type('Go')
+    cy.findByRole('button', { name: 'Restart' }).click()
+    getIframeBody()
+      .findByTestId('from-date')
+      .should('have.attr', 'type')
+      .should('eq', 'datetime-local')
+    getIframeBody()
+      .findByTestId('to-date')
+      .should('have.attr', 'type')
+      .should('eq', 'datetime-local')
+    getIframeBody().findByRole('button', { name: 'Go' })
+  })
+})

apps/builder/cypress/tests/inputs/email.ts

@@ -0,0 +1,33 @@
+import { createTypebotWithStep } from 'cypress/plugins/data'
+import { getIframeBody } from 'cypress/support'
+import { InputStepType } from 'models'
+
+describe('Email input', () => {
+  beforeEach(() => {
+    cy.task('seed')
+    createTypebotWithStep({ type: InputStepType.EMAIL })
+    cy.signOut()
+  })
+
+  it('options should work', () => {
+    cy.signIn('test2@gmail.com')
+    cy.visit('/typebots/typebot3/edit')
+    cy.findByRole('button', { name: 'Preview' }).click()
+    getIframeBody()
+      .findByPlaceholderText('Type your email...')
+      .should('have.attr', 'type')
+      .should('equal', 'email')
+    getIframeBody().findByRole('button', { name: 'Send' })
+    getIframeBody().findByPlaceholderText('Type your email...').should('exist')
+    getIframeBody().findByRole('button', { name: 'Send' }).should('be.disabled')
+    cy.findByTestId('step-step1').click({ force: true })
+    cy.findByRole('textbox', { name: 'Placeholder:' })
+      .clear()
+      .type('Your email...')
+    cy.findByRole('textbox', { name: 'Button label:' }).clear().type('Go')
+    cy.findByTestId('step-step1').should('contain.text', 'Your email...')
+    cy.findByRole('button', { name: 'Restart' }).click()
+    getIframeBody().findByPlaceholderText('Your email...').should('exist')
+    getIframeBody().findByRole('button', { name: 'Go' })
+  })
+})

apps/builder/cypress/tests/inputs/number.ts

@@ -0,0 +1,40 @@
+import { createTypebotWithStep } from 'cypress/plugins/data'
+import { getIframeBody } from 'cypress/support'
+import { InputStepType } from 'models'
+
+describe('Number input', () => {
+  beforeEach(() => {
+    cy.task('seed')
+    createTypebotWithStep({ type: InputStepType.NUMBER })
+    cy.signOut()
+  })
+
+  it('options should work', () => {
+    cy.signIn('test2@gmail.com')
+    cy.visit('/typebots/typebot3/edit')
+    cy.findByRole('button', { name: 'Preview' }).click()
+    getIframeBody()
+      .findByPlaceholderText('Type your answer...')
+      .should('have.attr', 'type')
+      .should('equal', 'number')
+    getIframeBody().findByRole('button', { name: 'Send' }).should('be.disabled')
+    cy.findByTestId('step-step1').click({ force: true })
+    cy.findByRole('textbox', { name: 'Placeholder:' })
+      .clear()
+      .type('Your name...')
+    cy.findByRole('textbox', { name: 'Button label:' }).clear().type('Go')
+    cy.findByRole('spinbutton', { name: 'Min:' }).type('0')
+    cy.findByRole('spinbutton', { name: 'Max:' }).type('100')
+    cy.findByRole('spinbutton', { name: 'Step:' }).type('10')
+    cy.findByRole('button', { name: 'Restart' }).click()
+    cy.findByTestId('step-step1').should('contain.text', 'Your name...')
+    getIframeBody()
+      .findByPlaceholderText('Your name...')
+      .should('exist')
+      .type('-1{enter}')
+      .clear()
+      .type('150{enter}')
+    getIframeBody().findByRole('button', { name: 'Go' })
+    cy.findByTestId('step-step1').click({ force: true })
+  })
+})

apps/builder/cypress/tests/inputs/phone.ts

@@ -0,0 +1,37 @@
+import { createTypebotWithStep } from 'cypress/plugins/data'
+import { getIframeBody } from 'cypress/support'
+import { InputStepType } from 'models'
+
+describe('Phone number input', () => {
+  beforeEach(() => {
+    cy.task('seed')
+    createTypebotWithStep({ type: InputStepType.PHONE })
+    cy.signOut()
+  })
+
+  it('options should work', () => {
+    cy.signIn('test2@gmail.com')
+    cy.visit('/typebots/typebot3/edit')
+    cy.findByRole('button', { name: 'Preview' }).click()
+    getIframeBody()
+      .findByPlaceholderText('Your phone number...')
+      .should('have.attr', 'type')
+      .should('eq', 'tel')
+    getIframeBody().findByRole('button', { name: 'Send' }).should('be.disabled')
+    cy.findByTestId('step-step1').click({ force: true })
+    cy.findByRole('textbox', { name: 'Placeholder:' })
+      .clear()
+      .type('+33 XX XX XX XX')
+    cy.findByRole('textbox', { name: 'Button label:' }).clear().type('Go')
+    cy.findByRole('button', { name: 'Restart' }).click()
+    getIframeBody()
+      .findByPlaceholderText('+33 XX XX XX XX')
+      .type('+33 6 73 18 45 36')
+    getIframeBody()
+      .findByRole('img')
+      .should('have.attr', 'alt')
+      .should('eq', 'France')
+    getIframeBody().findByRole('button', { name: 'Go' }).click()
+    getIframeBody().findByText('+33673184536').should('exist')
+  })
+})

apps/builder/cypress/tests/inputs/text.ts

@@ -0,0 +1,42 @@
+import { createTypebotWithStep } from 'cypress/plugins/data'
+import { preventUserFromRefreshing } from 'cypress/plugins/utils'
+import { getIframeBody } from 'cypress/support'
+import { InputStepType } from 'models'
+
+describe('Text input', () => {
+  beforeEach(() => {
+    cy.task('seed')
+    createTypebotWithStep({ type: InputStepType.TEXT })
+    cy.signOut()
+  })
+
+  afterEach(() => {
+    cy.window().then((win) => {
+      win.removeEventListener('beforeunload', preventUserFromRefreshing)
+    })
+  })
+
+  it('options should work', () => {
+    cy.signIn('test2@gmail.com')
+    cy.visit('/typebots/typebot3/edit')
+    cy.findByRole('button', { name: 'Preview' }).click()
+    getIframeBody()
+      .findByPlaceholderText('Type your answer...')
+      .should('have.attr', 'type')
+      .should('equal', 'text')
+    getIframeBody().findByRole('button', { name: 'Send' }).should('be.disabled')
+    cy.findByTestId('step-step1').click({ force: true })
+    cy.findByRole('textbox', { name: 'Placeholder:' })
+      .clear()
+      .type('Your name...')
+    cy.findByRole('textbox', { name: 'Button label:' }).clear().type('Go')
+    cy.findByRole('button', { name: 'Restart' }).click()
+    cy.findByTestId('step-step1').should('contain.text', 'Your name...')
+    getIframeBody().findByPlaceholderText('Your name...').should('exist')
+    getIframeBody().findByRole('button', { name: 'Go' })
+    cy.findByTestId('step-step1').click({ force: true })
+    cy.findByRole('checkbox', { name: 'Long text?' }).check({ force: true })
+    cy.findByRole('button', { name: 'Restart' }).click()
+    getIframeBody().findByTestId('textarea').should('exist')
+  })
+})

apps/builder/cypress/tests/inputs/url.ts

@@ -0,0 +1,31 @@
+import { createTypebotWithStep } from 'cypress/plugins/data'
+import { getIframeBody } from 'cypress/support'
+import { InputStepType } from 'models'
+
+describe('URL input', () => {
+  beforeEach(() => {
+    cy.task('seed')
+    createTypebotWithStep({ type: InputStepType.URL })
+    cy.signOut()
+  })
+
+  it('options should work', () => {
+    cy.signIn('test2@gmail.com')
+    cy.visit('/typebots/typebot3/edit')
+    cy.findByRole('button', { name: 'Preview' }).click()
+    getIframeBody()
+      .findByPlaceholderText('Type your URL...')
+      .should('have.attr', 'type')
+      .should('eq', 'url')
+    getIframeBody().findByRole('button', { name: 'Send' }).should('be.disabled')
+    cy.findByTestId('step-step1').click({ force: true })
+    cy.findByRole('textbox', { name: 'Placeholder:' })
+      .clear()
+      .type('Your URL...')
+    cy.findByRole('textbox', { name: 'Button label:' }).clear().type('Go')
+    cy.findByTestId('step-step1').should('contain.text', 'Your URL...')
+    cy.findByRole('button', { name: 'Restart' }).click()
+    getIframeBody().findByPlaceholderText('Your URL...').should('exist')
+    getIframeBody().findByRole('button', { name: 'Go' })
+  })
+})

apps/builder/cypress/tests/integrations/googleSheets.ts

@@ -121,7 +121,7 @@ describe('Google sheets', () => {
 })
 
 const fillInSpreadsheetInfo = () => {
-  cy.findByTestId('step-step1').click()
+  cy.findByText('Configure...').click()
 
   cy.findByRole('button', { name: 'Select an account' }).click()
   cy.findByRole('menuitem', { name: 'test2@gmail.com' }).click()

apps/builder/cypress/tests/logic/condition.ts

@@ -1,44 +1,6 @@
 import { preventUserFromRefreshing } from 'cypress/plugins/utils'
 import { getIframeBody } from 'cypress/support'
 
-describe('Set variables', () => {
-  beforeEach(() => {
-    cy.task('seed')
-    cy.signOut()
-  })
-
-  afterEach(() => {
-    cy.window().then((win) => {
-      win.removeEventListener('beforeunload', preventUserFromRefreshing)
-    })
-  })
-
-  it('options should work', () => {
-    cy.loadTypebotFixtureInDatabase('typebots/logic/setVariable.json')
-    cy.signIn('test2@gmail.com')
-    cy.visit('/typebots/typebot4/edit')
-    cy.findByTestId('step-number-step').click()
-    createNewVar('Num')
-    cy.findByTestId('step-set-var-1').click()
-    createNewVar('Total')
-    cy.findByRole('textbox', { name: 'Value / Expression:' }).type(
-      '1000 * {{Num}}',
-      { parseSpecialCharSequences: false }
-    )
-    cy.findByTestId('step-set-var-2').click()
-    createNewVar('Custom var')
-    cy.findByRole('textbox', { name: 'Value / Expression:' }).type(
-      'Custom value'
-    )
-    cy.findByRole('button', { name: 'Preview' }).click()
-    getIframeBody()
-      .findByPlaceholderText('Type your answer...')
-      .type('365{enter}')
-    getIframeBody().findByText('Total: 365000').should('exist')
-    getIframeBody().findByText('Custom var: Custom value')
-  })
-})
-
 describe('Condition step', () => {
   beforeEach(() => {
     cy.task('seed')
@@ -56,7 +18,7 @@ describe('Condition step', () => {
     cy.signIn('test2@gmail.com')
     cy.visit('/typebots/typebot4/edit')
 
-    cy.findByTestId('step-condition1').click()
+    cy.findAllByText('Equal to').first().click()
 
     cy.findByTestId('variables-input').click()
     cy.findByRole('menuitem', { name: 'Age' }).click()
@@ -71,7 +33,7 @@ describe('Condition step', () => {
     cy.findByRole('menuitem', { name: 'Less than' }).click()
     cy.findAllByPlaceholderText('Type a value...').last().type('100')
 
-    cy.findByTestId('step-condition2').click()
+    cy.findAllByText('Equal to').last().click()
 
     cy.findByTestId('variables-input').click()
     cy.findByRole('menuitem', { name: 'Age' }).click()
@@ -80,20 +42,21 @@ describe('Condition step', () => {
     cy.findByPlaceholderText('Type a value...').type('20')
 
     cy.findByRole('button', { name: 'Preview' }).click()
-    getIframeBody().findByPlaceholderText('Type your age...').type('15{enter}')
+    getIframeBody()
+      .findByPlaceholderText('Type your answer...')
+      .type('15{enter}')
     getIframeBody().findByText('You are younger than 20').should('exist')
 
     cy.findByRole('button', { name: 'Restart' }).click()
-    getIframeBody().findByPlaceholderText('Type your age...').type('45{enter}')
-    getIframeBody().findByText('Wow you are older than 20').should('exist')
+    getIframeBody()
+      .findByPlaceholderText('Type your answer...')
+      .type('45{enter}')
+    getIframeBody().findByText('You are older than 20').should('exist')
 
     cy.findByRole('button', { name: 'Restart' }).click()
-    getIframeBody().findByPlaceholderText('Type your age...').type('90{enter}')
-    getIframeBody().findByText('Wow you are older than 80').should('exist')
+    getIframeBody()
+      .findByPlaceholderText('Type your answer...')
+      .type('90{enter}')
+    getIframeBody().findByText('You are older than 80').should('exist')
   })
 })
-
-const createNewVar = (name: string) => {
-  cy.findByTestId('variables-input').type(name)
-  cy.findByRole('menuitem', { name: `Create "${name}"` }).click()
-}

apps/builder/cypress/tests/logic/setVariable.ts

@@ -0,0 +1,40 @@
+import { preventUserFromRefreshing } from 'cypress/plugins/utils'
+import { getIframeBody } from 'cypress/support'
+
+describe('Set variables', () => {
+  beforeEach(() => {
+    cy.task('seed')
+    cy.signOut()
+  })
+
+  afterEach(() => {
+    cy.window().then((win) => {
+      win.removeEventListener('beforeunload', preventUserFromRefreshing)
+    })
+  })
+
+  it('options should work', () => {
+    cy.loadTypebotFixtureInDatabase('typebots/logic/setVariable.json')
+    cy.signIn('test2@gmail.com')
+    cy.visit('/typebots/typebot4/edit')
+    cy.findByText('Type your answer...').click()
+    cy.createVariable('Num')
+    cy.findAllByText('Click to edit...').first().click()
+    cy.createVariable('Total')
+    cy.findByRole('textbox', { name: 'Value / Expression:' }).type(
+      '1000 * {{Num}}',
+      { parseSpecialCharSequences: false }
+    )
+    cy.findAllByText('Click to edit...').last().click()
+    cy.createVariable('Custom var')
+    cy.findByRole('textbox', { name: 'Value / Expression:' }).type(
+      'Custom value'
+    )
+    cy.findByRole('button', { name: 'Preview' }).click()
+    getIframeBody()
+      .findByPlaceholderText('Type your answer...')
+      .type('365{enter}')
+    getIframeBody().findByText('Total: 365000').should('exist')
+    getIframeBody().findByText('Custom var: Custom value')
+  })
+})