Fivedotzero e2e tests (#1745)

* rebase master

* Simplify metaduck

* update tests

* update tests

Author: OskarDamkjaer

e2e_tests/integration/auto-prefix.spec.ts

@@ -28,35 +28,37 @@ describe(':auto prefix in browser', () => {
     cy.executeCommand(':clear')
   })
 
-  it('shows help link when running period commit without :auto', () => {
-    cy.executeCommand('USING PERIODIC COMMIT RETURN "Verdanturf"')
-    cy.getFrames().contains('ERROR')
-    cy.getFrames().contains(':auto')
-  })
+  if (Cypress.config('serverVersion') < 5) {
+    it('shows help link when running period commit without :auto', () => {
+      cy.executeCommand('USING PERIODIC COMMIT RETURN "Verdanturf"')
+      cy.getFrames().contains('ERROR')
+      cy.getFrames().contains(':auto')
+    })
 
-  it('adding :auto enables running periodic commit', () => {
-    cy.executeCommand(':auto USING PERIODIC COMMIT RETURN "Laverre";')
-    // the only valid PERIODIC COMMIT queries require csv files on
-    // the server, so as a shortcut we're just looking for a new error message
-    cy.getFrames().contains('ERROR')
-    cy.getFrames().contains(/LOAD/i)
-  })
+    it('adding :auto enables running periodic commit', () => {
+      cy.executeCommand(':auto USING PERIODIC COMMIT RETURN "Laverre";')
+      // the only valid PERIODIC COMMIT queries require csv files on
+      // the server, so as a shortcut we're just looking for a new error message
+      cy.getFrames().contains('ERROR')
+      cy.getFrames().contains(/LOAD/i)
+    })
+  }
 
   if (Cypress.config('serverVersion') >= 4.4) {
     it('shows help link when running CALL IN TRANSACTIONS without :auto', () => {
       cy.executeCommand(
-        'CALL {{} return "Dendemille" } IN TRANSACTIONS return "Dendemille";'
+        `MATCH (n) WITH n CALL {{} CALL db.ping() YIELD SUCCESS {}} IN TRANSACTIONS`
       )
       cy.getFrames().contains('ERROR')
       cy.getFrames().contains(':auto')
     })
 
     it('adding :auto enables running CALL IN TRANSACTIONS', () => {
       cy.executeCommand(
-        ':auto CALL {{} return "Undella" } IN TRANSACTIONS return "Undella";'
+        `:auto MATCH (n) WITH n CALL {{} CALL db.ping() YIELD SUCCESS {}} IN TRANSACTIONS`
       )
       cy.getFrames().should('not.contain', 'ERROR')
-      cy.getFrames().contains('"Undella"')
+      cy.getFrames().contains('(no changes, no records)')
     })
   }
 

e2e_tests/integration/data-export.spec.ts

@@ -43,7 +43,14 @@ describe('Data export', () => {
     })
     const tests = [
       { panel: 'Visualization', expected: ['PNG', 'SVG'] },
-      { panel: 'Plan', expected: ['PNG', 'SVG'] }, // This test will fail in 5.0 -> one more option is enabled then
+      {
+        panel: 'Plan',
+        expected: [
+          ...(Cypress.config('serverVersion') >= 5.0 ? ['TXT'] : []),
+          'PNG',
+          'SVG'
+        ]
+      },
       { panel: 'Table', expected: ['CSV', 'JSON'] },
       { panel: 'Ascii', expected: ['CSV', 'JSON'] },
       { panel: 'Code', expected: ['CSV', 'JSON'] }

e2e_tests/integration/debug-command.spec.ts

@@ -23,10 +23,8 @@
 import { isAura } from '../support/utils'
 
 describe(':debug command', () => {
-  before(function() {
-    cy.visit(Cypress.config('url'))
-      .title()
-      .should('include', 'Neo4j Browser')
+  before(function () {
+    cy.visit(Cypress.config('url')).title().should('include', 'Neo4j Browser')
     cy.wait(3000)
   })
   it('can `:debug` command when not connected', () => {
@@ -39,7 +37,6 @@ describe(':debug command', () => {
     frame
       .should('have.length', 1)
       .should('contain', 'serverConfig')
-      .should('contain', '"proceduresReadable": false')
       .should('contain', '"serverConfigReadable": false')
       .should('contain', '"browser.allow_outgoing_connections": false')
   })
@@ -61,7 +58,6 @@ describe(':debug command', () => {
       frame
         .should('have.length', 1)
         .should('contain', 'serverConfig')
-        .should('contain', '"proceduresReadable": true')
         .should('contain', '"serverConfigReadable": true')
         .should('contain', '"dbms.security.auth_enabled": true')
     })

e2e_tests/integration/loadcsv.spec.ts

@@ -21,10 +21,8 @@
 /* global Cypress, cy, before */
 
 describe('LOAD CSV', () => {
-  before(function() {
-    cy.visit(Cypress.config('url'))
-      .title()
-      .should('include', 'Neo4j Browser')
+  before(function () {
+    cy.visit(Cypress.config('url')).title().should('include', 'Neo4j Browser')
     cy.wait(3000)
   })
   it('can connect', () => {
@@ -49,7 +47,10 @@ describe('LOAD CSV', () => {
     cy.resultContains('"I like unicorns, and "flying unicorns""')
   })
   it('imports with periodic commit', () => {
-    if (!Cypress.config('includeImportTests')) {
+    if (
+      !Cypress.config('includeImportTests') &&
+      Cypress.config('serverVersion') < 5
+    ) {
       return
     }
     const periodicQuery = `USING PERIODIC COMMIT 1{shift}{enter}

e2e_tests/integration/plan.spec.ts

@@ -23,10 +23,8 @@ import { isEnterpriseEdition } from '../support/utils'
 /* global Cypress, cy, before, after */
 
 describe('Plan output', () => {
-  before(function() {
-    cy.visit(Cypress.config('url'))
-      .title()
-      .should('include', 'Neo4j Browser')
+  before(function () {
+    cy.visit(Cypress.config('url')).title().should('include', 'Neo4j Browser')
     cy.wait(3000)
     const password = Cypress.config('password')
     cy.connect('neo4j', password)
@@ -96,17 +94,16 @@ describe('Plan output', () => {
     cy.executeCommand(':clear')
     cy.executeCommand('CREATE (:Tag)')
     cy.executeCommand(':clear')
-    cy.executeCommand(`PROFILE MATCH (tag:Tag){shift}{enter}
-    WHERE tag.name IN ["Eutheria"]
-    WITH tag
-    MATCH (publication)-[:HAS_TAG]->(tag)
-    WHERE SIZE((publication)-[:HAS_TAG]->()) = 1
-    WITH publication, tag
-    MATCH (expert)-[:PUBLISHED]->(publication)
-    WITH expert, collect(DISTINCT publication) AS publications, count(DISTINCT publication) AS relevantNumberOfPublications
-    RETURN expert.name, publications, relevantNumberOfPublications, 1 AS relevantNumberOfTags
-    ORDER BY relevantNumberOfPublications DESC
-    LIMIT 50;`)
+    cy.executeCommand(`PROFILE MATCH (tag:Tag){shift}{enter}WHERE tag.name IN ["Eutheria"]
+WITH tag
+MATCH (publication)-[:HAS_TAG]->(tag)
+WHERE SIZE([(publication)-[:HAS_TAG]->() | publication]) = 1
+WITH publication, tag
+MATCH (expert)-[:PUBLISHED]->(publication)
+WITH expert, collect(DISTINCT publication) AS publications, count(DISTINCT publication) AS relevantNumberOfPublications
+RETURN expert.name, publications, relevantNumberOfPublications, 1 AS relevantNumberOfTags
+ORDER BY relevantNumberOfPublications DESC
+LIMIT 50;`)
     cy.get('[data-testid="planExpandButton"]', { timeout: 10000 }).click()
     const el = cy.get('[data-testid="planSvg"]', { timeout: 10000 })
     el.then($el => {
@@ -136,7 +133,7 @@ describe('Plan output', () => {
 
       cy.executeCommand(':clear')
       cy.executeCommand(
-        'profile match (n:Person) with n where size ( (n)-[:Follows]->()) > 6 return n;'
+        'profile match (n:Person) with n where size ([(n)-[:Follows]->() | n]) > 6 return n;'
       )
       cy.get('[data-testid="planExpandButton"]', { timeout: 10000 }).click()
       const el2 = cy.get('[data-testid="planSvg"]', { timeout: 10000 })

e2e_tests/integration/schema-frame.spec.ts

@@ -21,18 +21,16 @@
 /* global Cypress, cy, before */
 
 describe('Schema Frame', () => {
-  before(function() {
-    cy.visit(Cypress.config('url'))
-      .title()
-      .should('include', 'Neo4j Browser')
+  before(function () {
+    cy.visit(Cypress.config('url')).title().should('include', 'Neo4j Browser')
     cy.wait(3000)
   })
   it('can connect', () => {
     const password = Cypress.config('password')
     cy.connect('neo4j', password)
   })
   describe('renders schema', () => {
-    before(function() {
+    before(function () {
       cy.executeCommand(
         'CREATE (n:SchemaTest {{}prop1: "foo", prop2: "bar"{}})'
       )
@@ -45,20 +43,30 @@ describe('Schema Frame', () => {
         cy.executeCommand('CREATE INDEX ON :SchemaTest(prop1, prop2)')
       }
 
-      cy.executeCommand(
-        'CREATE CONSTRAINT ON (n:SchemaTest) ASSERT n.prop1 IS UNIQUE'
-      )
+      if (Cypress.config('serverVersion') >= 5.0) {
+        cy.executeCommand(
+          'CREATE CONSTRAINT testConstraint FOR (n:SchemaTest) REQUIRE n.prop1 IS UNIQUE'
+        )
+      } else {
+        cy.executeCommand(
+          'CREATE CONSTRAINT ON (n:SchemaTest) ASSERT n.prop1 IS UNIQUE'
+        )
+      }
     })
-    after(function() {
+    after(function () {
       if (Cypress.config('serverVersion') >= 4.0) {
         cy.executeCommand('DROP INDEX compositeIndex')
       } else {
         cy.executeCommand('DROP INDEX ON :SchemaTest(prop1, prop2)')
       }
 
-      cy.executeCommand(
-        'DROP CONSTRAINT ON (n:SchemaTest) ASSERT n.prop1 IS UNIQUE'
-      )
+      if (Cypress.config('serverVersion') >= 5.0) {
+        cy.executeCommand('DROP CONSTRAINT testConstraint')
+      } else {
+        cy.executeCommand(
+          'DROP CONSTRAINT ON (n:SchemaTest) ASSERT n.prop1 IS UNIQUE'
+        )
+      }
       cy.executeCommand('MATCH (n:SchemaTest ) DETACH DELETE n')
     })
 

src/browser/components/ManualLink.tsx

@@ -24,7 +24,7 @@ import semver from 'semver'
 import { DrawerExternalLink } from './drawer/drawer-styled'
 import { formatDocVersion } from 'browser/modules/Sidebar/docsUtils'
 import { GlobalState } from 'project-root/src/shared/globalState'
-import { getVersion } from 'shared/modules/dbMeta/state'
+import { getRawVersion } from 'shared/modules/dbMeta/dbMetaDuck'
 
 const movedPages: { [key: string]: { oldPage: string; oldContent: string } } = {
   '/administration/indexes-for-search-performance/': {
@@ -86,7 +86,7 @@ export function ManualLink({
 }
 
 const mapStateToProps = (state: GlobalState) => ({
-  neo4jVersion: getVersion(state)
+  neo4jVersion: getRawVersion(state)
 })
 
 export default connect(mapStateToProps)(ManualLink)

src/browser/modules/App/App.tsx

@@ -73,7 +73,7 @@ import {
   getEdition,
   isServerConfigDone,
   shouldAllowOutgoingConnections
-} from 'shared/modules/dbMeta/state'
+} from 'shared/modules/dbMeta/dbMetaDuck'
 import {
   CONNECTION_ID,
   INJECTED_DISCOVERY

src/browser/modules/DBMSInfo/DBMSInfo.tsx

@@ -37,7 +37,7 @@ import {
 } from 'shared/modules/commands/commandsDuck'
 import { getUseDb } from 'shared/modules/connections/connectionsDuck'
 import { getCurrentUser } from 'shared/modules/currentUser/currentUserDuck'
-import { getDatabases } from 'shared/modules/dbMeta/state'
+import { getDatabases } from 'shared/modules/dbMeta/dbMetaDuck'
 import { getGraphStyleData } from 'shared/modules/grass/grassDuck'
 
 export function DBMSInfo(props: any): JSX.Element {
@@ -79,7 +79,7 @@ export function DBMSInfo(props: any): JSX.Element {
         />
         <LabelItems
           count={nodes}
-          labels={labels.slice(0, maxLabelsCount).map((l: any) => l.val)}
+          labels={labels.slice(0, maxLabelsCount)}
           totalNumItems={labels.length}
           onItemClick={onItemClick}
           onMoreClick={onMoreLabelsClick}
@@ -88,19 +88,15 @@ export function DBMSInfo(props: any): JSX.Element {
         />
         <RelationshipItems
           count={relationships}
-          relationshipTypes={relationshipTypes
-            .slice(0, maxRelationshipsCount)
-            .map((l: any) => l.val)}
+          relationshipTypes={relationshipTypes.slice(0, maxRelationshipsCount)}
           onItemClick={onItemClick}
           totalNumItems={relationshipTypes.length}
           onMoreClick={onMoreRelationshipsClick}
           moreStep={moreStep}
           graphStyleData={props.graphStyleData}
         />
         <PropertyItems
-          properties={properties
-            .slice(0, maxPropertiesCount)
-            .map((l: any) => l.val)}
+          properties={properties.slice(0, maxPropertiesCount)}
           onItemClick={onItemClick}
           totalNumItems={properties.length}
           onMoreClick={onMorePropertiesClick}

src/browser/modules/DBMSInfo/DatabaseKernelInfo.tsx

@@ -45,8 +45,8 @@ import {
   getDatabases,
   getEdition,
   getStoreSize,
-  getVersion
-} from 'shared/modules/dbMeta/state'
+  getRawVersion
+} from 'shared/modules/dbMeta/dbMetaDuck'
 import { getUsedDbName } from 'shared/modules/features/versionedFeatures'
 
 type DatabaseKernelInfo = {
@@ -134,7 +134,7 @@ export const DatabaseKernelInfo = ({
 
 const mapStateToProps = (state: any) => {
   return {
-    version: getVersion(state),
+    version: getRawVersion(state),
     edition: getEdition(state),
     dbName: getUsedDbName(state),
     storeSize: getStoreSize(state),