Skip to content
This repository was archived by the owner on Apr 30, 2023. It is now read-only.

Commit d0677e0

Browse files
authored
Merge pull request #385 from mareklibra/update.cypress.Dockerfile
Update test-container to the latest changes
2 parents 7579e90 + c1c2de3 commit d0677e0

30 files changed

+76
-2060
lines changed

Diff for: Dockerfile.cypress

+15-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
1-
FROM cypress/included:4.6.0
1+
FROM cypress/included:6.3.0
22

33
RUN mkdir /e2e
4-
COPY . /e2e
4+
5+
COPY LICENSE /e2e/
6+
COPY package.json /e2e/
7+
COPY yarn.lock /e2e/
8+
COPY cypress.json /e2e/
9+
COPY tsconfig.json /e2e/
10+
11+
COPY cypress /e2e/cypress
12+
COPY hacks /e2e/hacks
13+
14+
RUN cd /e2e && yarn install
15+
16+
## ENTRYPOINT /bin/bash
17+

Diff for: README.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,15 @@ $ source hacks/cypress_env_local.sh ; yarn cypress-run
8383
To run E2E tests via pre-built container:
8484

8585
```
86-
$ source hacks/cypress_env_local.sh ; hacks/run-tests.sh
86+
$ source hacks/cypress_env_container.sh ; hacks/run-tests.sh
8787
```
88+
89+
or
90+
91+
```
92+
$ source hacks/cypress_env_container.sh ; CONTAINER_COMMAND=docker TESTS_IMAGE=test:130 hacks/run-tests.sh -s /e2e/cypress/integration/03_clusterDetail.spec.ts
93+
```
94+
8895
This mode is good for automated testing after [test-infra](https://github.com/openshift/assisted-test-infra) redeployment.
8996

9097
It pulls image referenced by the `TESTS_IMAGE` env variable or `quay.io/ocpmetal/ocp-metal-ui-tests:latest` by default. These images are recently built for every commit merged to the assisted-ui master branch.

Diff for: cypress.examples/fixtures/example.json

-5
This file was deleted.

Diff for: cypress.examples/integration/examples/actions.spec.js

-291
This file was deleted.

Diff for: cypress.examples/integration/examples/aliasing.spec.js

-36
This file was deleted.

0 commit comments

Comments
 (0)