From 0bc38610ee08845c854e423a1abe238c382828f5 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Wed, 26 Jun 2019 10:55:21 +0200 Subject: [PATCH] move cypress env variables --- .travis.yml | 19 ++++++++-------- cypress.json | 8 ++++++- package-lock.json | 58 +++++++++++++++++++++++++++-------------------- package.json | 2 +- 4 files changed, 51 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index 558c04e..56a0c3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,22 +9,21 @@ addons: # for Cypress - libgconf-2-4 +env: + # run E2E tests against these values + - REACT_APP_NODE_URI="https://nile.dev-ocean.com" + - REACT_APP_AQUARIUS_URI="https://aquarius.marketplace.dev-ocean.com" + - REACT_APP_BRIZO_URI="https://brizo.marketplace.dev-ocean.com" + - REACT_APP_SECRET_STORE_URI="https://secret-store.marketplace.dev-ocean.com" + - REACT_APP_FAUCET_URI="https://faucet.nile.dev-ocean.com" + - REACT_APP_BRIZO_ADDRESS="0x4aaab179035dc57b35e2ce066919048686f82972" + before_install: - npm install -g npm - npm install -g codacy-coverage truffle ganache-cli script: # - ./scripts/install.sh # runs automatically with npm ci - # run E2E tests against these values - - export REACT_APP_NODE_URI="https://nile.dev-ocean.com" - - export REACT_APP_AQUARIUS_URI="https://aquarius.marketplace.dev-ocean.com" - - export REACT_APP_BRIZO_URI="https://brizo.marketplace.dev-ocean.com" - - export REACT_APP_SECRET_STORE_URI="https://secret-store.marketplace.dev-ocean.com" - - export REACT_APP_FAUCET_URI="https://faucet.nile.dev-ocean.com" - - export REACT_APP_BRIZO_ADDRESS="0x4aaab179035dc57b35e2ce066919048686f82972" - - export CYPRESS_NODE_URI=$REACT_APP_NODE_URI - - export CYPRESS_SEEDPHRASE="taxi music thumb unique chat sand crew more leg another off lamp" - - export CYPRESS_CONSUME_ASSET="http://localhost:3000/asset/did:op:8014d305dcb44b42a5355791a2f016a654a61184456a4d178dc6e5913deb3a5c" - ./scripts/test.sh - ./scripts/coverage.sh - ./scripts/build.sh diff --git a/cypress.json b/cypress.json index 0967ef4..0b2329f 100644 --- a/cypress.json +++ b/cypress.json @@ -1 +1,7 @@ -{} +{ + "env": { + "NODE_URI": "https://nile.dev-ocean.com", + "SEEDPHRASE": "taxi music thumb unique chat sand crew more leg another off lamp", + "CONSUME_ASSET": "http://localhost:3000/asset/did:op:fb172f4bfeb3454a99ec752fcd20f37665fa3f1879154746b1be1b014fae91d0" + } +} diff --git a/package-lock.json b/package-lock.json index fe642bc..171a824 100644 --- a/package-lock.json +++ b/package-lock.json @@ -567,6 +567,12 @@ "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=" }, + "arch": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz", + "integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==", + "dev": true + }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -681,12 +687,12 @@ "dev": true }, "async": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.4.0.tgz", - "integrity": "sha1-SZAgDxjqW4N8LMT4wDGmmFw4VhE=", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", + "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "dev": true, "requires": { - "lodash": "^4.14.0" + "lodash": "^4.17.10" } }, "async-limiter": { @@ -1833,25 +1839,26 @@ } }, "cypress": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.2.0.tgz", - "integrity": "sha512-PN0wz6x634QyNL56/voTzJoeScDfwtecvSfFTHfv5MkHuECVSR4VQcEZTvYtKWln3CMBMUkWbBKPIwwu2+a/kw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.3.1.tgz", + "integrity": "sha512-JIo47ZD9P3jAw7oaK7YKUoODzszJbNw41JmBrlMMiupHOlhmXvZz75htuo7mfRFPC9/1MDQktO4lX/V2+a6lGQ==", "dev": true, "requires": { "@cypress/listr-verbose-renderer": "0.4.1", "@cypress/xvfb": "1.2.4", + "arch": "2.1.1", "bluebird": "3.5.0", "cachedir": "1.3.0", "chalk": "2.4.2", "check-more-types": "2.24.0", "commander": "2.15.1", "common-tags": "1.8.0", - "debug": "3.1.0", + "debug": "3.2.6", "execa": "0.10.0", "executable": "4.1.1", "extract-zip": "1.6.7", "fs-extra": "4.0.1", - "getos": "3.1.0", + "getos": "3.1.1", "glob": "7.1.3", "is-ci": "1.2.1", "is-installed-globally": "0.1.0", @@ -1865,7 +1872,7 @@ "request": "2.88.0", "request-progress": "0.4.0", "supports-color": "5.5.0", - "tmp": "0.0.33", + "tmp": "0.1.0", "url": "0.11.0", "yauzl": "2.10.0" }, @@ -1877,12 +1884,12 @@ "dev": true }, "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "^2.1.1" } }, "execa": { @@ -1912,12 +1919,6 @@ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -1926,6 +1927,15 @@ "requires": { "has-flag": "^3.0.0" } + }, + "tmp": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz", + "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==", + "dev": true, + "requires": { + "rimraf": "^2.6.3" + } } } }, @@ -3834,12 +3844,12 @@ "dev": true }, "getos": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/getos/-/getos-3.1.0.tgz", - "integrity": "sha512-i9vrxtDu5DlLVFcrbqUqGWYlZN/zZ4pGMICCAcZoYsX3JA54nYp8r5EThw5K+m2q3wszkx4Th746JstspB0H4Q==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/getos/-/getos-3.1.1.tgz", + "integrity": "sha512-oUP1rnEhAr97rkitiszGP9EgDVYnmchgFzfqRzSkgtfv7ai6tEi7Ko8GgjNXts7VLWEqrTWyhsOKLe5C5b/Zkg==", "dev": true, "requires": { - "async": "2.4.0" + "async": "2.6.1" } }, "getpass": { diff --git a/package.json b/package.json index 5d56cc6..e4b1e3b 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@typescript-eslint/parser": "^1.7.0", "auto-changelog": "^1.13.0", "concurrently": "^4.1.0", - "cypress": "^3.2.0", + "cypress": "^3.3.1", "eslint": "^5.16.0", "eslint-config-oceanprotocol": "^1.3.0", "eslint-config-prettier": "^4.2.0",