Now?

cypress.json

@@ -1,7 +1,7 @@
 {
   "animationDistanceThreshold": 5,
   "baseUrl": null,
-  "chromeWebSecurity": true,
+  "chromeWebSecurity": false,
   "defaultCommandTimeout": 4000,
   "environmentVariables": {},
   "execTimeout": 60000,

e2e_tests/integration/0.index.spec.js

@@ -27,7 +27,7 @@ const ClearEditorButton = '[data-test-id="clearEditorContent"]'
 
 describe('Neo4j Browser', () => {
   it('sets new login credentials', () => {
-    const newPassword = Cypress.env('browser-password') || 'newpassword'
+    const newPassword = Cypress.config.password
     cy.setInitialPassword(newPassword)
     cy.disconnect()
   })
@@ -37,7 +37,7 @@ describe('Neo4j Browser', () => {
     cy.get(ClearEditorButton).click()
   })
   it('can connect', () => {
-    const password = Cypress.env('browser-password') || 'newpassword'
+    const password = Cypress.config.password
     cy.connect(
       'neo4j',
       password

e2e_tests/integration/bolt.spec.js

@@ -49,7 +49,7 @@ describe('Bolt connections', () => {
   })
   it('users with no role can connect', () => {
     cy.executeCommand(':clear')
-    const password = Cypress.env('browser-password') || 'newpassword'
+    const password = Cypress.config.password
     cy.connect(
       'neo4j',
       password

e2e_tests/integration/commands.spec.js

@@ -52,11 +52,19 @@ describe('Commands', () => {
   })
   it('can show connection error', () => {
     const password = 'unlikely password'
-    cy.connect('neo4j', password, undefined, false)
+    cy.connect(
+      'neo4j',
+      password,
+      undefined,
+      false
+    )
   })
   it('can connect', () => {
-    const password = Cypress.env('browser-password') || 'newpassword'
-    cy.connect('neo4j', password)
+    const password = Cypress.config.password
+    cy.connect(
+      'neo4j',
+      password
+    )
   })
   it('can run all simple commands while connected without blowing up', () => {
     commands.forEach(cmd => {

e2e_tests/integration/desktop-env.spec.js

@@ -24,10 +24,10 @@ let appContextListener
 
 describe('Neo4j Desktop environment', () => {
   it('loads with fake desktop api injected', () => {
-    cy.visit(Cypress.env('BROWSER_URL') || 'http://localhost:8080', {
+    cy.visit(Cypress.config.url, {
       onBeforeLoad: win => {
         win.neo4jDesktopApi = {
-          getContext: () => Promise.resolve(context),
+          getContext: () => Promise.resolve(getContext()),
           onContextUpdate: fn => (appContextListener = fn.bind(fn))
         }
       }
@@ -44,7 +44,7 @@ describe('Neo4j Desktop environment', () => {
   it('switches connection when that event is triggered', () => {
     cy.executeCommand(':clear')
     cy.wait(1000).then(() => {
-      appContextListener({ type: 'GRAPH_ACTIVE', id: 'test' }, context)
+      appContextListener({ type: 'GRAPH_ACTIVE', id: 'test' }, getContext())
     })
 
     const frames = cy.get('[data-test-id="frameCommand"]', { timeout: 10000 })
@@ -58,7 +58,7 @@ describe('Neo4j Desktop environment', () => {
   })
 })
 
-const context = {
+const getContext = () => ({
   projects: [
     {
       graphs: [
@@ -71,15 +71,17 @@ const context = {
                 bolt: {
                   enabled: true,
                   username: 'neo4j',
-                  password: Cypress.env('browser-password') || 'newpassword',
+                  password: Cypress.config.password,
                   host: 'localhost',
                   port: '7687',
-                  tlsLevel: 'OPTIONAL'
+                  tlsLevel: Cypress.config.url.startsWith('https')
+                    ? 'REQUIRED'
+                    : 'OPTIONAL'
                 },
                 http: {
                   enabled: true,
                   username: 'neo4j',
-                  password: Cypress.env('browser-password') || 'newpassword',
+                  password: Cypress.config.password,
                   host: 'localhost',
                   port: '7474'
                 }
@@ -90,4 +92,4 @@ const context = {
       ]
     }
   ]
-}
+})

e2e_tests/integration/loadcsv.spec.js

@@ -22,8 +22,11 @@
 
 describe('LOAD CSV', () => {
   it('can connect', () => {
-    const password = Cypress.env('browser-password') || 'newpassword'
-    cy.connect('neo4j', password)
+    const password = Cypress.config.password
+    cy.connect(
+      'neo4j',
+      password
+    )
   })
   it('imports without periodic commit', () => {
     if (!Cypress.config.includeImportTests) {

e2e_tests/integration/multistatements.spec.js

@@ -34,7 +34,7 @@ describe('Multi statements', () => {
     cy.get('[data-test-id="drawerSettings"]').click()
   })
   it('can connect', () => {
-    const password = Cypress.env('browser-password') || 'newpassword'
+    const password = Cypress.config.password
     cy.connect(
       'neo4j',
       password

e2e_tests/integration/params.spec.js

@@ -39,7 +39,7 @@ function runTests () {
   let setParamQ
   let getParamQ
   // it('can connect', () => {
-  const password = Cypress.env('browser-password') || 'newpassword'
+  const password = Cypress.config.password
   cy.connect(
     'neo4j',
     password

e2e_tests/integration/plan.spec.js

@@ -22,7 +22,7 @@
 
 describe('Plan output', () => {
   it('can connect', () => {
-    const password = Cypress.env('browser-password') || 'newpassword'
+    const password = Cypress.config.password
     cy.connect(
       'neo4j',
       password

e2e_tests/integration/style.spec.js

@@ -22,8 +22,11 @@
 
 describe(':style', () => {
   it('can connect', () => {
-    const password = Cypress.env('browser-password') || 'newpassword'
-    cy.connect('neo4j', password)
+    const password = Cypress.config.password
+    cy.connect(
+      'neo4j',
+      password
+    )
   })
   it('print the current style', () => {
     cy.executeCommand(':clear')
@@ -33,12 +36,10 @@ describe(':style', () => {
 
     const query = ':style'
     cy.executeCommand(query)
-    cy
-      .get('[data-test-id="frameCommand"]', { timeout: 10000 })
+    cy.get('[data-test-id="frameCommand"]', { timeout: 10000 })
       .first()
       .should('contain', query)
-    cy
-      .get('[data-test-id="frameContents"]', { timeout: 10000 })
+    cy.get('[data-test-id="frameContents"]', { timeout: 10000 })
       .first()
       .should('contain', 'node {')
       .should('contain', 'relationship {')
@@ -48,12 +49,10 @@ describe(':style', () => {
     cy.executeCommand(':clear')
     cy.executeCommand(':style')
     cy.get('[data-test-id="exportGrassButton"]', { timeout: 10000 })
-    cy
-      .get('[data-test-id="styleResetButton"]', { timeout: 10000 })
+    cy.get('[data-test-id="styleResetButton"]', { timeout: 10000 })
       .first()
       .click()
-    cy
-      .get('[data-test-id="frameContents"]', { timeout: 10000 })
+    cy.get('[data-test-id="frameContents"]', { timeout: 10000 })
       .first()
       .should('contain', 'No style generated or set yet')
   })

e2e_tests/integration/types.spec.js

@@ -22,7 +22,7 @@
 
 describe('Types in Browser', () => {
   it('can connect', () => {
-    const password = Cypress.env('browser-password') || 'newpassword'
+    const password = Cypress.config.password
     cy.connect(
       'neo4j',
       password

e2e_tests/support/defaults.js

@@ -2,3 +2,5 @@
 
 Cypress.config.serverVersion = parseFloat(Cypress.env('server')) || 3.4
 Cypress.config.includeImportTests = Cypress.env('include-import-tests') || false
+Cypress.config.url = Cypress.env('BROWSER_URL') || 'http://localhost:8080'
+Cypress.config.password = Cypress.env('browser-password') || 'newpassword'

e2e_tests/support/index.js

@@ -4,8 +4,7 @@ import './defaults'
 /* global Cypress, cy, before */
 
 before(function () {
-  cy
-    .visit(Cypress.env('BROWSER_URL') || 'http://localhost:8080')
+  cy.visit(Cypress.config.url)
     .title()
     .should('include', 'Neo4j Browser')
 })

package.json

@@ -80,7 +80,7 @@
     "coffee-script": "^1.12.7",
     "copy-webpack-plugin": "^4.0.1",
     "css-loader": "^0.28.7",
-    "cypress": "^3.0.1",
+    "cypress": "^3.1.0",
     "eslint": "^4.6.1",
     "eslint-config-standard": "^10.2.1",
     "eslint-config-standard-jsx": "^4.0.1",