Skip to content

Commit

Permalink
have cypress running locally - the tests still fail
Browse files Browse the repository at this point in the history
  • Loading branch information
ulfgebhardt committed Apr 12, 2021
1 parent 9a9d015 commit 0ec0574
Show file tree
Hide file tree
Showing 6 changed files with 402 additions and 268 deletions.
2 changes: 2 additions & 0 deletions cypress/plugins/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ module.exports = (on, config) => {
config.env.NEO4J_USERNAME = parsed.NEO4J_USERNAME
config.env.NEO4J_PASSWORD = parsed.NEO4J_PASSWORD
config.env.JWT_SECRET = parsed.JWT_SECRET
// config.baseUrl = 'http://localhost:3000'
// config.chromeWebSecurity = false
on('file:preprocessor', cucumber())
return config
}
2 changes: 1 addition & 1 deletion cypress/support/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import './commands'
import './factories'

// intermittent failing tests
import 'cypress-plugin-retries'
// import 'cypress-plugin-retries'

// Alternatively you can use CommonJS syntax:
// require('./commands')
Expand Down
11 changes: 11 additions & 0 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,17 @@ services:
########################################################
neo4j:
image: ocelotsocialnetwork/neo4j:community
#environment:
# - NEO4J_dbms_connector_bolt_enabled=true
# - NEO4J_dbms_connector_bolt_tls__level=OPTIONAL
# - NEO4J_dbms_connector_bolt_listen__address=0.0.0.0:7687
# - NEO4J_auth=none
# - NEO4J_dbms_connectors_default__listen__address=0.0.0.0
# - NEO4J_dbms_connector_http_listen__address=0.0.0.0:7474
# - NEO4J_dbms_connector_https_listen__address=0.0.0.0:7473
networks:
# So we can access the neo4j query browser from our host machine
- external-net

########################################################
# MAINTENANCE ##########################################
Expand Down
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"cypress:backend": "cd backend && yarn run dev",
"cypress:webapp": "cd webapp && yarn run dev",
"cypress:setup": "run-p cypress:backend cypress:webapp",
"cypress:run": "cross-env cypress run --browser firefox",
"cypress:open": "cross-env cypress open --browser firefox",
"cypress:run": "cross-env cypress run --browser electron",
"cypress:open": "cross-env cypress open --browser electron",
"cucumber:setup": "cd backend && yarn run dev",
"cucumber": "wait-on tcp:4000 && cucumber-js --require-module @babel/register --exit",
"release": "yarn version --no-git-tag-version --no-commit-hooks --no-commit && auto-changelog --latest-version $(node -p -e \"require('./package.json').version\") && cd backend && yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version $(node -p -e \"require('./../package.json').version\") && cd ../webapp && yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version $(node -p -e \"require('./../package.json').version\")"
Expand All @@ -34,10 +34,9 @@
"codecov": "^3.7.1",
"cross-env": "^7.0.2",
"cucumber": "^6.0.5",
"cypress": "^4.2.0",
"cypress": "^7.0.1",
"cypress-cucumber-preprocessor": "^2.2.1",
"cypress-file-upload": "^3.5.3",
"cypress-plugin-retries": "^1.5.2",
"date-fns": "^2.12.0",
"dotenv": "^8.2.0",
"expect": "^25.3.0",
Expand Down
2 changes: 1 addition & 1 deletion webapp/config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const environment = {
const server = {
GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000',
BACKEND_TOKEN: process.env.BACKEND_TOKEN || 'NULL',
WEBSOCKETS_URI: process.env.WEBSOCKETS_URI || 'ws://localhost:4000/graphql',
WEBSOCKETS_URI: process.env.WEBSOCKETS_URI || 'ws://localhost:3000/api/graphql',
}

const sentry = {
Expand Down
Loading

0 comments on commit 0ec0574

Please sign in to comment.