Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Cypress #2622

Merged
merged 6 commits into from
Jan 19, 2018
Merged

Update Cypress #2622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
18ac6f1
chore(*): update cypress
Nov 1, 2017
cd6270b
fix(DOMUTILS-test): mock offsetWidth getter
nLight Dec 8, 2017
d97a7be
chore(cypress): update system tests setup to support cypress 1.4.1
nLight Jan 12, 2018
b4943f8
chore(cypress): don't upload video if tests pass
nLight Jan 17, 2018
87e37d8
fix(cypress): skip tests that fail due to bug in cypress
nLight Jan 18, 2018
36d0851
fix(TasksTable-cy): adjust test to pass in headless mode
nLight Jan 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
FROM mesosphere/dcos-system-test-driver:latest

# Specify the component versions to use
ENV CYPRESS_VERSION="0.19.1" \
NODE_VERSION="4.4.7" \
ENV NODE_VERSION="4.4.7" \
NPM_VERSION="3.9" \
JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64"

Expand Down Expand Up @@ -32,9 +31,7 @@ RUN set -x \
/var/lib/dpkg/info/ca-certificates-java.postinst configure \
# Install npm dependencies
&& cd /dcos-ui \
&& npm install -g cypress-cli git://github.com/johntron/http-server.git#proxy-secure-flag \
# Install cypress
&& cypress install --cypress-version ${CYPRESS_VERSION} \
&& npm install -g git://github.com/johntron/http-server.git#proxy-secure-flag \
# Install dcos-launch
&& curl 'https://downloads.dcos.io/dcos-launch/bin/linux/dcos-launch' > /usr/local/bin/dcos-launch \
&& chmod +x /usr/local/bin/dcos-launch \
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ pipeline {
'export PATH=`pwd`/node_modules/.bin:$PATH',
'http-server -p 4200 dist&',
'SERVER_PID=$!',
'cypress run --reporter junit --reporter-options \'mochaFile=cypress/results.xml\'',
'npm run cypress -- --reporter junit --reporter-options \'mochaFile=cypress/results.xml\'',
'RET=$?',
'echo "cypress exit status: ${RET}"',
'sleep 10',
Expand Down
8 changes: 5 additions & 3 deletions cypress.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"defaultCommandTimeout": 6000,
"environmentVariables": {
"env": {
"CLUSTER_URL": "http://localhost:4200",
"FULL_INTEGRATION_TEST": false
},
"fixturesFolder": "tests/_fixtures",
"integrationFolder": "tests",
"projectId": "a209b1cd-e44f-47a4-b22c-d8f26649f43f",
"supportFile": "tests/_support",
"waitForAnimations": true
}
"waitForAnimations": true,
"videoUploadOnPasses": false,
"numTestsKeptInMemory": 0
}
Loading