fix(tests): 💚 Fix tests

baptisteArno · Jan 19, 2022 · ab34f95 · ab34f95
1 parent 3506d86
commit ab34f95
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 60 deletions.
diff --git a/apps/builder/components/shared/InputWithVariableButton.tsx b/apps/builder/components/shared/InputWithVariableButton.tsx
@@ -78,7 +78,7 @@ export const InputWithVariableButton = ({
         bgColor={'white'}
       />
       <InputRightElement>
-        <Popover matchWidth isLazy>
+        <Popover matchWidth isLazy closeOnBlur={false}>
           <PopoverTrigger>
             <IconButton
               aria-label="Insert a variable"

diff --git a/apps/builder/components/shared/VariableSearchInput.tsx b/apps/builder/components/shared/VariableSearchInput.tsx
@@ -111,62 +111,60 @@ export const VariableSearchInput = ({
             {...inputProps}
           />
         </PopoverTrigger>
-        <Portal>
-          <PopoverContent
-            maxH="35vh"
-            overflowY="scroll"
-            spacing="0"
-            role="menu"
-            w="inherit"
-            shadow="lg"
-          >
-            {(inputValue?.length ?? 0) > 0 &&
-              !isDefined(variables.find((v) => v.name === inputValue)) && (
-                <Button
-                  role="menuitem"
-                  minH="40px"
-                  onClick={handleCreateNewVariableClick}
-                  fontSize="16px"
-                  fontWeight="normal"
-                  rounded="none"
-                  colorScheme="gray"
-                  variant="ghost"
-                  justifyContent="flex-start"
-                  leftIcon={<PlusIcon />}
-                >
-                  Create "{inputValue}"
-                </Button>
-              )}
-            {filteredItems.length > 0 && (
-              <>
-                {filteredItems.map((item, idx) => {
-                  return (
-                    <Button
-                      role="menuitem"
-                      minH="40px"
-                      key={idx}
-                      onClick={handleVariableNameClick(item)}
-                      fontSize="16px"
-                      fontWeight="normal"
-                      rounded="none"
-                      colorScheme="gray"
-                      variant="ghost"
-                      justifyContent="space-between"
-                    >
-                      {item.name}
-                      <IconButton
-                        icon={<TrashIcon />}
-                        aria-label="Remove variable"
-                        size="xs"
-                        onClick={handleDeleteVariableClick(item)}
-                      />
-                    </Button>
-                  )
-                })}
-              </>
+        <PopoverContent
+          maxH="35vh"
+          overflowY="scroll"
+          spacing="0"
+          role="menu"
+          w="inherit"
+          shadow="lg"
+        >
+          {(inputValue?.length ?? 0) > 0 &&
+            !isDefined(variables.find((v) => v.name === inputValue)) && (
+              <Button
+                role="menuitem"
+                minH="40px"
+                onClick={handleCreateNewVariableClick}
+                fontSize="16px"
+                fontWeight="normal"
+                rounded="none"
+                colorScheme="gray"
+                variant="ghost"
+                justifyContent="flex-start"
+                leftIcon={<PlusIcon />}
+              >
+                Create "{inputValue}"
+              </Button>
             )}
-          </PopoverContent>
-        </Portal>
+          {filteredItems.length > 0 && (
+            <>
+              {filteredItems.map((item, idx) => {
+                return (
+                  <Button
+                    role="menuitem"
+                    minH="40px"
+                    key={idx}
+                    onClick={handleVariableNameClick(item)}
+                    fontSize="16px"
+                    fontWeight="normal"
+                    rounded="none"
+                    colorScheme="gray"
+                    variant="ghost"
+                    justifyContent="space-between"
+                  >
+                    {item.name}
+                    <IconButton
+                      icon={<TrashIcon />}
+                      aria-label="Remove variable"
+                      size="xs"
+                      onClick={handleDeleteVariableClick(item)}
+                    />
+                  </Button>
+                )
+              })}
+            </>
+          )}
+        </PopoverContent>
       </Popover>
     </Flex>
   )

diff --git a/apps/builder/cypress/tests/integrations/googleAnalytics.ts b/apps/builder/cypress/tests/integrations/googleAnalytics.ts
@@ -15,7 +15,7 @@ describe('Google Analytics', () => {
     })
   })
 
-  it.only('can be filled correctly', () => {
+  it('can be filled correctly', () => {
     cy.signIn('[email protected]')
     cy.visit('/typebots/typebot3/edit')
     cy.intercept({

diff --git a/apps/builder/cypress/tests/integrations/googleSheets.ts b/apps/builder/cypress/tests/integrations/googleSheets.ts
@@ -32,7 +32,7 @@ describe('Google sheets', () => {
     cy.findByRole('button', { name: 'Insert a variable' }).click()
     cy.findByRole('menuitem', { name: 'Email' }).click()
 
-    cy.findByRole('button', { name: 'Add' }).click()
+    cy.findByRole('button', { name: 'Add a value' }).click()
 
     cy.findByRole('button', { name: 'Select a column' }).click()
     cy.findByRole('menuitem', { name: 'First name' }).click()
@@ -106,7 +106,7 @@ describe('Google sheets', () => {
     cy.findByRole('menuitem', { name: 'First name' }).click()
     createNewVar('First name')
 
-    cy.findByRole('button', { name: 'Add' }).click()
+    cy.findByRole('button', { name: 'Add a value' }).click()
 
     cy.findByRole('button', { name: 'Select a column' }).click()
     cy.findByRole('menuitem', { name: 'Last name' }).click()

diff --git a/apps/builder/cypress/tests/logic.ts b/apps/builder/cypress/tests/logic.ts
@@ -64,7 +64,7 @@ describe('Condition step', () => {
     cy.findByRole('menuitem', { name: 'Greater than' }).click()
     cy.findByPlaceholderText('Type a value...').type('80')
 
-    cy.findByRole('button', { name: 'Add' }).click()
+    cy.findByRole('button', { name: 'Add a comparison' }).click()
     cy.findAllByTestId('variables-input').last().click()
     cy.findByRole('menuitem', { name: 'Age' }).click()
     cy.findByRole('button', { name: 'Equal to' }).click()