Work on e2e tests

neo4j · Feb 19, 2021 · ffab3fd · ffab3fd
1 parent 3d86dda
commit ffab3fd
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 22 deletions.
diff --git a/e2e_tests/integration/0.index.spec.ts b/e2e_tests/integration/0.index.spec.ts
@@ -152,8 +152,6 @@ describe('Neo4j Browser', () => {
       cy.get(Editor).type(`RETURN 1{enter}`, { force: true })
 
       cy.get('[data-testid="frame-Favorite"]').click()
-      cy.get('[data-testid="saveScript"]').click()
-
       cy.get('[data-testid="savedScriptListItem"]')
         .first()
         .contains('RETURN 1')

diff --git a/e2e_tests/integration/saved-scripts.spec.ts b/e2e_tests/integration/saved-scripts.spec.ts
@@ -26,22 +26,19 @@ describe('Saved Scripts', () => {
       .title()
       .should('include', 'Neo4j Browser')
     //cy.wait(3000)
+    // TODO REMOVE THIS
     cy.connect('neo4j', Cypress.config('password'))
   })
 
   it('can save a result as favorite', () => {
     cy.executeCommand('RETURN 1')
     cy.get('[data-testid=frame-Favorite]').click()
-    cy.get('[data-testid=scriptName]')
-      .clear()
-      .type('script name')
-    cy.get('[data-testid=saveScript]').click()
 
     // saved in the list and can populate editor
-    cy.get('[data-testid="navicon-script name"').click({ force: true })
+    cy.get('[data-testid="navicon-RETURN 1"').click({ force: true })
     cy.get('[data-testid="contextMenuEdit"').click()
 
-    cy.get('[data-testid="currentlyEditing"]').contains('script name')
+    cy.get('[data-testid="currentlyEditing"]').contains('RETURN 1')
     // Editing script updates name and content
     cy.get('[data-testid="activeEditor"] textarea')
       .type(
@@ -67,17 +64,9 @@ describe('Saved Scripts', () => {
     cy.executeCommand(':clear')
     cy.executeCommand(':help cypher')
     cy.get('[data-testid=frame-Favorite]').click()
-    cy.get('[data-testid=scriptName]')
-      .invoke('val')
-      .should('equal', ':help cypher')
-
-    cy.get('[data-testid=saveScript]').click()
 
     cy.get('[data-testid="savedScriptsButton-New folder"]').click()
-    cy.get('[data-testid="savedScriptsButton-Edit"]').click({ force: true })
-    cy.get('[data-testid="editSavedScriptFolderName"]')
-      .clear()
-      .type('fldr{enter}')
+    cy.get('[data-testid=editSavedScriptFolderName]').type('fldr{enter}')
 
     cy.get('[data-testid="scriptTitle-:help cypher"]').trigger('dragstart')
 
@@ -95,10 +84,8 @@ describe('Saved Scripts', () => {
     cy.get('[data-testid="scriptTitle-:help cypher"]').should('exist')
 
     // cleanup and delete the folder as well
-    cy.get('[data-testid="savedScriptsButton-Edit"]')
-      .first()
-      .click({ force: true })
-    cy.get('[data-testid="savedScriptsButton-Remove"]').click()
+    cy.get('[data-testid=navicon-fldr]').click({ force: true })
+    cy.get('[data-testid=contextMenuRename]').click()
     cy.get('[data-testid=expandFolder-fldr]').should('not.exist')
     cy.get('[data-testid=drawerFavorites]').click()
   })

diff --git a/src/browser/components/SavedScripts/SavedScriptsFolder.tsx b/src/browser/components/SavedScripts/SavedScriptsFolder.tsx
@@ -118,6 +118,7 @@ function SavedScriptsFolder({
     <ContextMenuHoverParent
       ref={drop}
       data-testid={`savedScriptsFolder-${folder.name}`}
+      stayVisible={showOverlay}
     >
       <SavedScriptsFolderMain>
         <SavedScriptsFolderHeader title={folder.name} ref={blurRef}>

diff --git a/src/browser/modules/Frame/FrameTitlebar.tsx b/src/browser/modules/Frame/FrameTitlebar.tsx
@@ -452,6 +452,7 @@ const mapDispatchToProps = (
   return {
     newFavorite: (cmd: string) => {
       dispatch(addFavorite(cmd))
+      dispatch(sidebar.open('favorites'))
     },
     newProjectFile: (cmd: string) => {
       dispatch(sidebar.setDraftScript(cmd, 'project files'))

diff --git a/src/shared/modules/sidebar/sidebarDuck.ts b/src/shared/modules/sidebar/sidebarDuck.ts
@@ -23,6 +23,7 @@ import { GlobalState } from 'shared/globalState'
 export const NAME = 'sidebar'
 
 export const TOGGLE = 'sidebar/TOGGLE'
+export const OPEN = 'sidebar/OPEN'
 export const SET_DRAFT_SCRIPT = 'sidebar/SET_DRAFT_SCRIPT'
 
 export function getOpenDrawer(state: GlobalState): string | null {
@@ -67,13 +68,18 @@ function toggleDrawer(state: SidebarState, drawer: DrawerId): SidebarState {
   return { draftScript: null, drawer, scriptId: null }
 }
 
-type SidebarAction = ToggleAction | SetDraftScriptAction
+type SidebarAction = ToggleAction | SetDraftScriptAction | OpenAction
 
 interface ToggleAction {
   type: typeof TOGGLE
   drawerId: DrawerId
 }
 
+interface OpenAction {
+  type: typeof OPEN
+  drawerId: DrawerId
+}
+
 interface SetDraftScriptAction {
   type: typeof SET_DRAFT_SCRIPT
   cmd: string | null
@@ -88,6 +94,8 @@ export default function reducer(
   switch (action.type) {
     case TOGGLE:
       return toggleDrawer(state, action.drawerId)
+    case OPEN:
+      return { ...state, drawer: action.drawerId }
     case SET_DRAFT_SCRIPT:
       return {
         drawer: action.drawerId,
@@ -102,6 +110,10 @@ export function toggle(drawerId: DrawerId): ToggleAction {
   return { type: TOGGLE, drawerId }
 }
 
+export function open(drawerId: DrawerId): OpenAction {
+  return { type: OPEN, drawerId }
+}
+
 export function setDraftScript(
   cmd: string | null,
   drawerId: DrawerId,