Skip to content

Commit

Permalink
Rename e2e-local to e2e-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
trotttrotttrott committed Jun 8, 2020
1 parent b70876e commit 286e7cb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ e2e: # Run all end-to-end tests.
--abort-on-container-exit \
--exit-code-from e2e

e2e-local: # Run e2e tests in Cypress test runner.
e2e-dev: # Run e2e tests in Cypress test runner.
GRAFANA_VERSION=${E2E_GRAFANA_VERSION} \
DISPLAY=$$(ipconfig getifaddr en0):0 \
docker-compose -f e2e/docker-compose.local.yml up \
docker-compose -f e2e/docker-compose.dev.yml up \
--abort-on-container-exit \
--exit-code-from e2e

Expand Down
4 changes: 2 additions & 2 deletions e2e/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ our human abilities to assert truth.

`make e2e`: runs tests headless and exits.

`make e2e-local`: opens the [the test
`make e2e-dev`: opens the [the test
runner](https://docs.cypress.io/guides/core-concepts/test-runner.html#Overview)
and exposes Grafana to the host machine - http://localhost:3030. This requires
and exposes Grafana to the host machine - http://localhost:3030. This requires
an X11 server to work. [This
post](https://www.cypress.io/blog/2019/05/02/run-cypress-with-a-single-docker-command/#Interactive-mode)
describes how to set this up with [XQuartz](https://www.xquartz.org/).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
context: .
args:
CYPRESS_IMAGE: cypress/included:4.7.0
image: grafonnet-e2e-local
image: grafonnet-e2e-dev
entrypoint: cypress open --project .
depends_on:
- grafana
Expand Down

0 comments on commit 286e7cb

Please sign in to comment.