1
0
mirror of https://github.com/oceanprotocol/commons.git synced 2023-03-15 18:03:00 +01:00

Merge pull request #165 from oceanprotocol/fix/cypress

Cypress cleanup & fixes
This commit is contained in:
Matthias Kretschmann 2019-06-26 18:44:28 +02:00 committed by GitHub
commit c6e791dabd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 2142 additions and 2858 deletions

View File

@ -1,3 +1,4 @@
node_modules node_modules
build build
dist dist
coverage

View File

@ -1,4 +1,5 @@
dist: xenial dist: xenial
sudo: required
language: node_js language: node_js
node_js: node_js:
- '11' - '11'
@ -9,22 +10,25 @@ addons:
# for Cypress # for Cypress
- libgconf-2-4 - libgconf-2-4
env:
global:
# 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.pacific.dev-ocean.com"
- REACT_APP_FAUCET_URI="https://faucet.nile.dev-ocean.com"
- REACT_APP_BRIZO_ADDRESS="0x4aaab179035dc57b35e2ce066919048686f82972"
before_install: before_install:
- npm install -g npm - npm install -g npm
- npm install -g codacy-coverage truffle ganache-cli - npm install -g codacy-coverage truffle ganache-cli
# Fixes an issue where the max file watch count is exceeded, triggering ENOSPC
# https://stackoverflow.com/questions/22475849/node-js-error-enospc#32600959
- echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
script: script:
# - ./scripts/install.sh # runs automatically with npm ci # - ./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/test.sh
- ./scripts/coverage.sh - ./scripts/coverage.sh
- ./scripts/build.sh - ./scripts/build.sh

View File

@ -22,17 +22,19 @@
If you're a developer and want to contribute to, or want to utilize this marketplace's code in your projects, then keep on reading. If you're a developer and want to contribute to, or want to utilize this marketplace's code in your projects, then keep on reading.
- [🏄 Get Started](#-get-started) - [🏄 Get Started](#-Get-Started)
- [🏖 Remote Ocean: Nile](#-remote-ocean-nile) - [🏖 Remote Ocean: Nile](#-Remote-Ocean-Nile)
- [🐳 Use with Barge](#-use-with-barge) - [🐳 Use with Barge](#-Use-with-Barge)
- [⛵️ Environment Variables](#-environment-variables) - [⛵️ Environment Variables](#-Environment-Variables)
- [👩‍🔬 Testing](#-testing) - [👩‍🔬 Testing](#-Testing)
- [✨ Code Style](#-code-style) - [Unit Tests](#Unit-Tests)
- [🛳 Production](#-production) - [End-to-End Integration Tests](#End-to-End-Integration-Tests)
- [⬆️ Releases](#-releases) - [✨ Code Style](#-Code-Style)
- [📜 Changelog](#-changelog) - [🛳 Production](#-Production)
- [🎁 Contributing](#-contributing) - [⬆️ Releases](#-Releases)
- [🏛 License](#-license) - [📜 Changelog](#-Changelog)
- [🎁 Contributing](#-Contributing)
- [🏛 License](#-License)
## 🏄 Get Started ## 🏄 Get Started
@ -90,14 +92,16 @@ vi client/.env.local
## 👩‍🔬 Testing ## 👩‍🔬 Testing
Test suite is setup with [Jest](https://jestjs.io) and [react-testing-library](https://github.com/kentcdodds/react-testing-library). Test suite is setup with [Jest](https://jestjs.io) and [react-testing-library](https://github.com/kentcdodds/react-testing-library) for unit testing, and [Cypress](https://www.cypress.io) for integration testing.
To run all tests, including all linting tests: To run all linting, unit and integration tests in one go, run:
```bash ```bash
npm test npm test
``` ```
### Unit Tests
For local development, you can start the test runners for client & server in a watch mode. For local development, you can start the test runners for client & server in a watch mode.
```bash ```bash
@ -114,6 +118,24 @@ cd server/
npm run test:watch npm run test:watch
``` ```
### End-to-End Integration Tests
To run all integration tests in headless mode, run:
```bash
npm run test:e2e
```
This will automatically spin up all required resources to run the integrations tests, and then run them.
The endpoints Cypress runs against are defined by your [Environment Variables](#-Environment-Variables), and Cypress-specific variables in `cypress.json`.
You can also use the UI of Cypress to run and inspect the integration tests locally:
```bash
npm run cypress:open
```
## ✨ Code Style ## ✨ Code Style
For linting and auto-formatting you can use from the root of the project: For linting and auto-formatting you can use from the root of the project:

View File

@ -39,7 +39,7 @@ REACT_APP_BRIZO_ADDRESS="0x4aaab179035dc57b35e2ce066919048686f82972"
# REACT_APP_NODE_URI="https://nile.dev-ocean.com" # REACT_APP_NODE_URI="https://nile.dev-ocean.com"
# REACT_APP_AQUARIUS_URI="https://aquarius.marketplace.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_BRIZO_URI="https://brizo.marketplace.dev-ocean.com"
# REACT_APP_SECRET_STORE_URI="https://secret-store.marketplace.dev-ocean.com" # REACT_APP_SECRET_STORE_URI="https://secret-store.dev-ocean.com"
# REACT_APP_FAUCET_URI="https://faucet.nile.dev-ocean.com" # REACT_APP_FAUCET_URI="https://faucet.nile.dev-ocean.com"
# REACT_APP_BRIZO_ADDRESS="0x4aaab179035dc57b35e2ce066919048686f82972" # REACT_APP_BRIZO_ADDRESS="0x4aaab179035dc57b35e2ce066919048686f82972"

124
client/package-lock.json generated
View File

@ -1540,21 +1540,22 @@
} }
}, },
"@testing-library/dom": { "@testing-library/dom": {
"version": "5.0.1", "version": "5.4.0",
"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-5.0.1.tgz", "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-5.4.0.tgz",
"integrity": "sha512-HmyN4b/PmSaSB1ku0tWjgnTtyrwNBXEpp44wgfNaDhyj6IJTCWp1GAf4AANoLGItgMsYjepwWOdMyuJ/8iyStQ==", "integrity": "sha512-0OQsquNYfbxgqqoGf9RZ9lglXEYgKlhSe+W9UFQGDAvT554Y9PG6hGe0RHYggAXe/GoNPccSsl65nn+qq0cFKw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/runtime": "^7.4.5", "@babel/runtime": "^7.4.5",
"@sheerun/mutationobserver-shim": "^0.3.2", "@sheerun/mutationobserver-shim": "^0.3.2",
"aria-query": "3.0.0",
"pretty-format": "^24.8.0", "pretty-format": "^24.8.0",
"wait-for-expect": "^1.2.0" "wait-for-expect": "^1.2.0"
} }
}, },
"@testing-library/react": { "@testing-library/react": {
"version": "8.0.1", "version": "8.0.4",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-8.0.1.tgz", "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-8.0.4.tgz",
"integrity": "sha512-N/1pJfhEnNYkGyxuw4xbp03evaS0z/CT8o0QgTfJqGlukAcU15xf9uU1w03NHKZJcU69nOCBAoAkXHtHzYwMbg==", "integrity": "sha512-omm4D00Z0aMaWfPRRP4X6zIaOVb0Kf1Yc1H5VE4id9D0pQRiBcTtmjbN0kZgT8rQGxHhVAuv1NuwFwMTwKzFqg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/runtime": "^7.4.5", "@babel/runtime": "^7.4.5",
@ -1661,9 +1662,9 @@
} }
}, },
"@types/jest": { "@types/jest": {
"version": "24.0.13", "version": "24.0.15",
"resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.13.tgz", "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.15.tgz",
"integrity": "sha512-3m6RPnO35r7Dg+uMLj1+xfZaOgIHHHut61djNjzwExXN4/Pm9has9C6I1KMYSfz7mahDhWUOVg4HW/nZdv5Pww==", "integrity": "sha512-MU1HIvWUme74stAoc3mgAi+aMlgKOudgEvQDIm1v4RkrDudBh1T+NFp5sftpBAdXdx1J0PbdpJ+M2EsSOi1djA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/jest-diff": "*" "@types/jest-diff": "*"
@ -1693,9 +1694,9 @@
"dev": true "dev": true
}, },
"@types/react": { "@types/react": {
"version": "16.8.19", "version": "16.8.22",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.19.tgz", "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.22.tgz",
"integrity": "sha512-QzEzjrd1zFzY9cDlbIiFvdr+YUmefuuRYrPxmkwG0UQv5XF35gFIi7a95m1bNVcFU0VimxSZ5QVGSiBmlggQXQ==", "integrity": "sha512-C3O1yVqk4sUXqWyx0wlys76eQfhrQhiDhDlHBrjER76lR2S2Agiid/KpOU9oCqj1dISStscz7xXz1Cg8+sCQeA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/prop-types": "*", "@types/prop-types": "*",
@ -1749,9 +1750,9 @@
} }
}, },
"@types/react-router": { "@types/react-router": {
"version": "5.0.1", "version": "5.0.2",
"resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.0.1.tgz", "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.0.2.tgz",
"integrity": "sha512-vOyVO0u3Cs0w6G5DzYqNVqcTsurEnDgOmmkJf2s7VwtunWzpPgI6dHsCBX68vXqeICpP6jCfojgJcHkm5BV7hQ==", "integrity": "sha512-sdMN284GEOcqDEMS/hE/XD06Abw2fws30+xkZf3C9cSRcWopiv/HDTmunYI7DKLYKVRaWFkq1lkuJ6qeYu0E7A==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/history": "*", "@types/history": "*",
@ -1759,9 +1760,9 @@
} }
}, },
"@types/react-router-dom": { "@types/react-router-dom": {
"version": "4.3.3", "version": "4.3.4",
"resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-4.3.3.tgz", "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-4.3.4.tgz",
"integrity": "sha512-xj0DmFjgvAqRfh/kJPO7apD5G30yPQe+8slu/dugioQOkdKpyzc4Fgk4hoTelm6CSHz7pI2PPsW5+Y6GRBF2zw==", "integrity": "sha512-xrwaWHpnxKk/TTRe7pmoGy3E4SyF/ojFqNfFJacw7OLdfLXRvGfk4r/XePVaZNVfeJzL8fcnNilPN7xOdJ/vGw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/history": "*", "@types/history": "*",
@ -1770,9 +1771,9 @@
} }
}, },
"@types/react-transition-group": { "@types/react-transition-group": {
"version": "2.9.1", "version": "2.9.2",
"resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-2.9.1.tgz", "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-2.9.2.tgz",
"integrity": "sha512-1usq4DRUVBFnxc9KGJAlJO9EpQrLZGDDEC8wDOn2+2ODSyudYo8FiIzPDRaX/hfQjHqGeeoNaNdA2bj0l35hZQ==", "integrity": "sha512-5Fv2DQNO+GpdPZcxp2x/OQG/H19A01WlmpjVD9cKvVFmoVLOZ9LvBgSWG6pSXIU4og5fgbvGPaCV5+VGkWAEHA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/react": "*" "@types/react": "*"
@ -1785,9 +1786,9 @@
"dev": true "dev": true
}, },
"@types/underscore": { "@types/underscore": {
"version": "1.8.18", "version": "1.9.1",
"resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.8.18.tgz", "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.9.1.tgz",
"integrity": "sha512-mXQ8u416FWMPjp2zWrcVmOZtzKQM6IeyVcuE+RGF/04JLBrMjfnmNKn74VN8fIkFzU97TpzkP0ny0p0h65eC7w==", "integrity": "sha512-ROHiJBeuXxVVaKm65tM/LHWlkcTFBQJqJgDB90Vj3fsl8Q290Z29cmEwnpvtlb0nSzuMIaIYWj0ZvmVgim8khA==",
"dev": true "dev": true
}, },
"@types/unist": { "@types/unist": {
@ -1818,9 +1819,9 @@
} }
}, },
"@types/web3": { "@types/web3": {
"version": "1.0.18", "version": "1.0.19",
"resolved": "https://registry.npmjs.org/@types/web3/-/web3-1.0.18.tgz", "resolved": "https://registry.npmjs.org/@types/web3/-/web3-1.0.19.tgz",
"integrity": "sha512-uXQL0LDszt2f476LEmYM6AvSv9F4vU4hWQvlUhwfLHNlIB6OyBXoYsCzWAIhhnc5U0HA7ZBcPybxRJ/yfA6THg==", "integrity": "sha512-fhZ9DyvDYDwHZUp5/STa9XW2re0E8GxoioYJ4pEUZ13YHpApSagixj7IAdoYH5uAK+UalGq6Ml8LYzmgRA/q+A==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/bn.js": "*", "@types/bn.js": "*",
@ -4894,9 +4895,9 @@
} }
}, },
"date-fns": { "date-fns": {
"version": "2.0.0-alpha.27", "version": "2.0.0-beta.1",
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.0.0-alpha.27.tgz", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.0.0-beta.1.tgz",
"integrity": "sha512-cqfVLS+346P/Mpj2RpDrBv0P4p2zZhWWvfY5fuWrXNR/K38HaAGEkeOwb47hIpQP9Jr/TIxjZ2/sNMQwdXuGMg==" "integrity": "sha512-ls5W/PUZmrtck53HD3Sd0564NlnNoQtcxNCwWcIzULJMNNgAPVKHoylVXPau7vdyu5/JTd25ljtan+iWnnUKkw=="
}, },
"date-now": { "date-now": {
"version": "0.1.4", "version": "0.1.4",
@ -8503,9 +8504,9 @@
} }
}, },
"jest-dom": { "jest-dom": {
"version": "3.4.0", "version": "3.5.0",
"resolved": "https://registry.npmjs.org/jest-dom/-/jest-dom-3.4.0.tgz", "resolved": "https://registry.npmjs.org/jest-dom/-/jest-dom-3.5.0.tgz",
"integrity": "sha512-fQR5ESaxTfNbZE02y+gtaQH7+sMwzrQtJo5OE0E3BNArjTL9GWNI+uPFr1yS24eodH1X62L+qncv106M/O98gQ==", "integrity": "sha512-xHnP3Qo/29oLAo2iixaZsoDrm3XKSVrMH5Wf2ZEiLychJQBTNzOeVMPxrCygCgJiyQMbnymXltme8bPzuiGOIA==",
"dev": true, "dev": true,
"requires": { "requires": {
"chalk": "^2.4.1", "chalk": "^2.4.1",
@ -10481,6 +10482,16 @@
"dom-walk": "^0.1.0" "dom-walk": "^0.1.0"
} }
}, },
"mini-create-react-context": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz",
"integrity": "sha512-2v+OeetEyliMt5VHMXsBhABoJ0/M4RCe7fatd/fBy6SMiKazUSEt3gxxypfnk2SHMkdBYvorHRoQxuGoiwbzAw==",
"requires": {
"@babel/runtime": "^7.4.0",
"gud": "^1.0.0",
"tiny-warning": "^1.0.2"
}
},
"mini-css-extract-plugin": { "mini-css-extract-plugin": {
"version": "0.5.0", "version": "0.5.0",
"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz", "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz",
@ -12781,9 +12792,9 @@
"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
}, },
"query-string": { "query-string": {
"version": "6.5.0", "version": "6.8.1",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-6.5.0.tgz", "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.8.1.tgz",
"integrity": "sha512-TYC4hDjZSvVxLMEucDMySkuAS9UIzSbAiYGyA9GWCjLKB8fQpviFbjd20fD7uejCDxZS+ftSdBKE6DS+xucJFg==", "integrity": "sha512-g6y0Lbq10a5pPQpjlFuojfMfV1Pd2Jw9h75ypiYPPia3Gcq2rgkKiIwbkS6JxH7c5f5u/B/sB+d13PU+g1eu4Q==",
"requires": { "requires": {
"decode-uri-component": "^0.2.0", "decode-uri-component": "^0.2.0",
"split-on-first": "^1.0.0", "split-on-first": "^1.0.0",
@ -12918,9 +12929,9 @@
} }
}, },
"react-datepicker": { "react-datepicker": {
"version": "2.6.0", "version": "2.7.0",
"resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-2.6.0.tgz", "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-2.7.0.tgz",
"integrity": "sha512-EcgQPqwHpQ80jvRrBowkvEcDfx0Rxf6mK3zUOuJQG9VdB4JXPGyQK6kZaCv9KgCAtCuu2f/12dU0Utw0+JAnDw==", "integrity": "sha512-hGe55tPi+ZWqv8GZ4TLKR8J1iCd/DNFM3JA9b5s51nsv+flfWCwrPyPDLxZGnO2aAPZbOazcHpUisCswlYManQ==",
"requires": { "requires": {
"classnames": "^2.2.5", "classnames": "^2.2.5",
"date-fns": "^2.0.0-alpha.23", "date-fns": "^2.0.0-alpha.23",
@ -13105,9 +13116,9 @@
"integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw=="
}, },
"react-ga": { "react-ga": {
"version": "2.5.7", "version": "2.6.0",
"resolved": "https://registry.npmjs.org/react-ga/-/react-ga-2.5.7.tgz", "resolved": "https://registry.npmjs.org/react-ga/-/react-ga-2.6.0.tgz",
"integrity": "sha512-UmATFaZpEQDO96KFjB5FRLcT6hFcwaxOmAJZnjrSiFN/msTqylq9G+z5Z8TYzN/dbamDTiWf92m6MnXXJkAivQ==" "integrity": "sha512-GWHBWZDFjDGMkIk1LzroIn0mNTygKw3adXuqvGvheFZvlbpqMPbHsQsTdQBIxRRdXGQM/Zq+dQLRPKbwIHMTaw=="
}, },
"react-helmet": { "react-helmet": {
"version": "5.2.1", "version": "5.2.1",
@ -13126,9 +13137,9 @@
"integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==" "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA=="
}, },
"react-markdown": { "react-markdown": {
"version": "4.0.8", "version": "4.1.0",
"resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-4.0.8.tgz", "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-4.1.0.tgz",
"integrity": "sha512-Z6oa648rufvzyO0KwYJ/9p9AsdYGIluqK6OlpJ35ouJ8HPF0Ko1WDNdyymjDSHxNrkb7HDyEcIDJCQs8NlET5A==", "integrity": "sha512-EOHsEAN+aoP8UVz7vTHx6Z63GJfhrO9KItKlfsiBtVVS9tmSWtUaBTw73+2SObrWiOiE2Cs9qUBL7ORsvVhOrA==",
"requires": { "requires": {
"html-to-react": "^1.3.4", "html-to-react": "^1.3.4",
"mdast-add-list-metadata": "1.0.1", "mdast-add-list-metadata": "1.0.1",
@ -13171,15 +13182,15 @@
} }
}, },
"react-router": { "react-router": {
"version": "5.0.0", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-5.0.0.tgz", "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.0.1.tgz",
"integrity": "sha512-6EQDakGdLG/it2x9EaCt9ZpEEPxnd0OCLBHQ1AcITAAx7nCnyvnzf76jKWG1s2/oJ7SSviUgfWHofdYljFexsA==", "integrity": "sha512-EM7suCPNKb1NxcTZ2LEOWFtQBQRQXecLxVpdsP4DW4PbbqYWeRiLyV/Tt1SdCrvT2jcyXAXmVTmzvSzrPR63Bg==",
"requires": { "requires": {
"@babel/runtime": "^7.1.2", "@babel/runtime": "^7.1.2",
"create-react-context": "^0.2.2",
"history": "^4.9.0", "history": "^4.9.0",
"hoist-non-react-statics": "^3.1.0", "hoist-non-react-statics": "^3.1.0",
"loose-envify": "^1.3.1", "loose-envify": "^1.3.1",
"mini-create-react-context": "^0.3.0",
"path-to-regexp": "^1.7.0", "path-to-regexp": "^1.7.0",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"react-is": "^16.6.0", "react-is": "^16.6.0",
@ -13203,15 +13214,15 @@
} }
}, },
"react-router-dom": { "react-router-dom": {
"version": "5.0.0", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.0.0.tgz", "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.0.1.tgz",
"integrity": "sha512-wSpja5g9kh5dIteZT3tUoggjnsa+TPFHSMrpHXMpFsaHhQkm/JNVGh2jiF9Dkh4+duj4MKCkwO6H08u6inZYgQ==", "integrity": "sha512-zaVHSy7NN0G91/Bz9GD4owex5+eop+KvgbxXsP/O+iW1/Ln+BrJ8QiIR5a6xNPtrdTvLkxqlDClx13QO1uB8CA==",
"requires": { "requires": {
"@babel/runtime": "^7.1.2", "@babel/runtime": "^7.1.2",
"history": "^4.9.0", "history": "^4.9.0",
"loose-envify": "^1.3.1", "loose-envify": "^1.3.1",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"react-router": "5.0.0", "react-router": "5.0.1",
"tiny-invariant": "^1.0.2", "tiny-invariant": "^1.0.2",
"tiny-warning": "^1.0.0" "tiny-warning": "^1.0.0"
} }
@ -13330,10 +13341,11 @@
} }
}, },
"react-transition-group": { "react-transition-group": {
"version": "4.1.0", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.1.0.tgz", "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.1.1.tgz",
"integrity": "sha512-/OITbogb3emGN49WaP7468QGSde7er5w6eIHldIDCSQBq/9QTSCzs8OgpgmOnaUXCXzBUcK1zoZ6DqRlM8CJtA==", "integrity": "sha512-K/N1wqJ2GRP2yj3WBqEUYa0KV5fiaAWpUfU9SpHOHefeKvyrO+VrnMBML21M19QZoVbDZKmuQFHZYoMMi1xuJA==",
"requires": { "requires": {
"@babel/runtime": "^7.4.5",
"dom-helpers": "^3.4.0", "dom-helpers": "^3.4.0",
"loose-envify": "^1.4.0", "loose-envify": "^1.4.0",
"prop-types": "^15.6.2" "prop-types": "^15.6.2"

View File

@ -18,44 +18,44 @@
"@sindresorhus/slugify": "^0.9.1", "@sindresorhus/slugify": "^0.9.1",
"axios": "^0.19.0", "axios": "^0.19.0",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"ethereum-blockies": "MyEtherWallet/blockies", "ethereum-blockies": "github:MyEtherWallet/blockies",
"filesize": "^4.1.2", "filesize": "^4.1.2",
"history": "^4.9.0", "history": "^4.9.0",
"is-url": "^1.2.4", "is-url": "^1.2.4",
"moment": "^2.24.0", "moment": "^2.24.0",
"query-string": "^6.5.0", "query-string": "^6.8.1",
"react": "^16.8.6", "react": "^16.8.6",
"react-collapsed": "^2.0.1", "react-collapsed": "^2.0.1",
"react-datepicker": "^2.5.0", "react-datepicker": "^2.7.0",
"react-dom": "^16.8.6", "react-dom": "^16.8.6",
"react-dotdotdot": "^1.3.0", "react-dotdotdot": "^1.3.0",
"react-ga": "^2.5.7", "react-ga": "^2.6.0",
"react-helmet": "^5.2.1", "react-helmet": "^5.2.1",
"react-markdown": "^4.0.8", "react-markdown": "^4.1.0",
"react-moment": "^0.9.2", "react-moment": "^0.9.2",
"react-paginate": "^6.3.0", "react-paginate": "^6.3.0",
"react-popper": "^1.3.3", "react-popper": "^1.3.3",
"react-router-dom": "^5.0.0", "react-router-dom": "^5.0.1",
"react-transition-group": "^4.0.0", "react-transition-group": "^4.1.1",
"web3": "1.0.0-beta.37" "web3": "1.0.0-beta.37"
}, },
"devDependencies": { "devDependencies": {
"@react-mock/state": "^0.1.8", "@react-mock/state": "^0.1.8",
"@testing-library/react": "^8.0.1", "@testing-library/react": "^8.0.4",
"@types/classnames": "^2.2.7", "@types/classnames": "^2.2.7",
"@types/filesize": "^4.1.0", "@types/filesize": "^4.1.0",
"@types/is-url": "^1.2.28", "@types/is-url": "^1.2.28",
"@types/jest": "^24.0.12", "@types/jest": "^24.0.15",
"@types/react": "^16.8.15", "@types/react": "^16.8.22",
"@types/react-datepicker": "^2.3.0", "@types/react-datepicker": "^2.3.0",
"@types/react-dom": "^16.8.4", "@types/react-dom": "^16.8.4",
"@types/react-dotdotdot": "^1.2.0", "@types/react-dotdotdot": "^1.2.0",
"@types/react-helmet": "^5.0.8", "@types/react-helmet": "^5.0.8",
"@types/react-paginate": "^6.2.1", "@types/react-paginate": "^6.2.1",
"@types/react-router-dom": "^4.3.2", "@types/react-router-dom": "^4.3.4",
"@types/react-transition-group": "^2.9.1", "@types/react-transition-group": "^2.9.2",
"@types/web3": "^1.0.18", "@types/web3": "^1.0.19",
"jest-dom": "^3.1.4", "jest-dom": "^3.5.0",
"jest-mock-axios": "^3.0.0", "jest-mock-axios": "^3.0.0",
"node-sass": "^4.12.0", "node-sass": "^4.12.0",
"react-scripts": "^3.0.0", "react-scripts": "^3.0.0",

View File

@ -134,9 +134,7 @@ export default class VersionNumbers extends PureComponent<
return ( return (
<p className={styles.versionsMinimal}> <p className={styles.versionsMinimal}>
<a <a
title={`${squid.name} v${squid.version}\n${brizo.name} v${ title={`${squid.name} v${squid.version}\n${brizo.name} v${brizo.version}\n${aquarius.name} v${aquarius.version}`}
brizo.version
}\n${aquarius.name} v${aquarius.version}`}
href={'/about'} href={'/about'}
> >
v{commons.version} {squid.network && `(${squid.network})`} v{commons.version} {squid.network && `(${squid.network})`}

View File

@ -16,9 +16,7 @@ const Footer = () => (
<Market.Consumer> <Market.Consumer>
{state => {state =>
state.totalAssets > 0 && state.totalAssets > 0 &&
` With a total of ${ ` With a total of ${state.totalAssets} registered assets.`
state.totalAssets
} registered assets.`
} }
</Market.Consumer> </Market.Consumer>
</p> </p>

View File

@ -34,9 +34,7 @@ export default class AssetDetails extends PureComponent<AssetDetailsProps> {
</h2> </h2>
<div className={styles.metaPrimaryData}> <div className={styles.metaPrimaryData}>
<span <span
title={`Date created, published on ${ title={`Date created, published on ${base.datePublished}`}
base.datePublished
}`}
> >
<Moment <Moment
date={base.dateCreated} date={base.dateCreated}

View File

@ -1 +1,8 @@
{} {
"baseUrl": "http://localhost:3000",
"env": {
"NODE_URI": "https://nile.dev-ocean.com",
"SEEDPHRASE": "taxi music thumb unique chat sand crew more leg another off lamp",
"CONSUME_ASSET": "did:op:8014d305dcb44b42a5355791a2f016a654a61184456a4d178dc6e5913deb3a5c"
}
}

View File

@ -1,27 +1,7 @@
/// <reference types="Cypress" /> /// <reference types="Cypress" />
import Web3 from 'web3'
import HDWalletProvider from 'truffle-hdwallet-provider'
context('Consume', () => { context('Consume', () => {
before(() => { before(() => {
cy.on('window:before:load', win => { cy.visit(`/asset/${Cypress.env('CONSUME_ASSET')}`)
const provider = new HDWalletProvider(
Cypress.env('SEEDPHRASE')
? Cypress.env('SEEDPHRASE')
: 'taxi music thumb unique chat sand crew more leg another off lamp',
Cypress.env('NODE_URI')
? Cypress.env('NODE_URI')
: 'https://nile.dev-ocean.com'
)
win.web3 = new Web3(provider)
win.ethereum = win.web3
})
cy.visit(
Cypress.env('CONSUME_ASSET')
? Cypress.env('CONSUME_ASSET')
: 'http://localhost:3000/asset/did:op:8014d305dcb44b42a5355791a2f016a654a61184456a4d178dc6e5913deb3a5c'
)
// Wait for end of loading // Wait for end of loading
cy.get('button', { timeout: 60000 }).should('have.length', 1) cy.get('button', { timeout: 60000 }).should('have.length', 1)
@ -35,7 +15,7 @@ context('Consume', () => {
// Click consume button // Click consume button
cy.get('button').click() cy.get('button').click()
// Wait consume process to end // Wait consume process to end
cy.get('button', { timeout: 120000 }).should('contain', 'Get file') cy.get('button', { timeout: 150000 }).should('contain', 'Get file')
// check if there is no error // check if there is no error
cy.get('article>div').should( cy.get('article>div').should(
'not.contain', 'not.contain',

View File

@ -1,23 +1,7 @@
/// <reference types="Cypress" /> /// <reference types="Cypress" />
import Web3 from 'web3'
import HDWalletProvider from 'truffle-hdwallet-provider'
context('Faucet', () => { context('Faucet', () => {
before(() => { before(() => {
cy.on('window:before:load', win => { cy.visit('/faucet')
const provider = new HDWalletProvider(
Cypress.env('SEEDPHRASE')
? Cypress.env('SEEDPHRASE')
: 'taxi music thumb unique chat sand crew more leg another off lamp',
Cypress.env('NODE_URI')
? Cypress.env('NODE_URI')
: 'https://nile.dev-ocean.com'
)
win.web3 = new Web3(provider)
win.ethereum = win.web3
})
cy.visit('http://localhost:3000/faucet')
// Wait for end of loading // Wait for end of loading
cy.get('button', { timeout: 60000 }).should('have.length', 1) cy.get('button', { timeout: 60000 }).should('have.length', 1)
}) })

View File

@ -1,23 +1,7 @@
/// <reference types="Cypress" /> /// <reference types="Cypress" />
import Web3 from 'web3'
import HDWalletProvider from 'truffle-hdwallet-provider'
context('Publish', () => { context('Publish', () => {
before(() => { before(() => {
cy.on('window:before:load', win => { cy.visit('/publish')
const provider = new HDWalletProvider(
Cypress.env('SEEDPHRASE')
? Cypress.env('SEEDPHRASE')
: 'taxi music thumb unique chat sand crew more leg another off lamp',
Cypress.env('NODE_URI')
? Cypress.env('NODE_URI')
: 'https://nile.dev-ocean.com'
)
win.web3 = new Web3(provider)
win.ethereum = win.web3
})
cy.visit('http://localhost:3000/publish')
cy.get('article>div', { timeout: 60000 }).should( cy.get('article>div', { timeout: 60000 }).should(
'contain', 'contain',

View File

@ -1,23 +1,7 @@
/// <reference types="Cypress" /> /// <reference types="Cypress" />
import Web3 from 'web3'
import HDWalletProvider from 'truffle-hdwallet-provider'
context('Search', () => { context('Search', () => {
before(() => { before(() => {
cy.on('window:before:load', win => { cy.visit('/')
const provider = new HDWalletProvider(
Cypress.env('SEEDPHRASE')
? Cypress.env('SEEDPHRASE')
: 'taxi music thumb unique chat sand crew more leg another off lamp',
Cypress.env('NODE_URI')
? Cypress.env('NODE_URI')
: 'https://nile.dev-ocean.com'
)
win.web3 = new Web3(provider)
win.ethereum = win.web3
})
cy.visit('http://localhost:3000')
// Wait for end of loading // Wait for end of loading
cy.get('button', { timeout: 60000 }).should('have.length', 1) cy.get('button', { timeout: 60000 }).should('have.length', 1)
}) })

View File

@ -1,14 +0,0 @@
/// <reference types="Cypress" />
context('Viewport', () => {
beforeEach(() => {
cy.visit('http://localhost:3000')
})
it('cy.viewport() - set the viewport size and dimension', () => {
cy.get('#root > div > header > div > a > h1').should('be.visible')
cy.viewport(320, 480)
cy.get('#root > div > header > div > a > h1').should('not.be.visible')
})
})

View File

@ -0,0 +1,14 @@
/// <reference types="Cypress" />
import Web3 from 'web3'
import HDWalletProvider from 'truffle-hdwallet-provider'
before(function() {
cy.on('window:before:load', win => {
const provider = new HDWalletProvider(
Cypress.env('SEEDPHRASE'),
Cypress.env('NODE_URI')
)
win.web3 = new Web3(provider)
win.ethereum = win.web3
})
})

4567
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -25,27 +25,26 @@
"cypress:open": "cypress open" "cypress:open": "cypress open"
}, },
"dependencies": { "dependencies": {
"react-collapsed": "^2.0.1",
"truffle-hdwallet-provider": "^1.0.10", "truffle-hdwallet-provider": "^1.0.10",
"web3": "1.0.0-beta.37" "web3": "1.0.0-beta.37"
}, },
"devDependencies": { "devDependencies": {
"@release-it/bumper": "^1.0.2", "@release-it/bumper": "^1.0.3",
"@typescript-eslint/eslint-plugin": "^1.7.0", "@typescript-eslint/eslint-plugin": "^1.11.0",
"@typescript-eslint/parser": "^1.7.0", "@typescript-eslint/parser": "^1.11.0",
"auto-changelog": "^1.13.0", "auto-changelog": "^1.13.0",
"concurrently": "^4.1.0", "concurrently": "^4.1.1",
"cypress": "^3.2.0", "cypress": "^3.3.1",
"eslint": "^5.16.0", "eslint": "^5.16.0",
"eslint-config-oceanprotocol": "^1.3.0", "eslint-config-oceanprotocol": "^1.3.0",
"eslint-config-prettier": "^4.2.0", "eslint-config-prettier": "^6.0.0",
"eslint-plugin-cypress": "^2.2.1", "eslint-plugin-cypress": "^2.2.1",
"eslint-plugin-prettier": "^3.0.1", "eslint-plugin-prettier": "^3.1.0",
"prettier": "^1.17.0", "prettier": "^1.18.2",
"prettier-stylelint": "^0.4.2", "prettier-stylelint": "^0.4.2",
"release-it": "^11.0.2", "release-it": "^12.3.0",
"start-server-and-test": "^1.9.0", "start-server-and-test": "^1.9.1",
"stylelint": "^10.0.1", "stylelint": "^10.1.0",
"stylelint-config-bigchaindb": "^1.2.2", "stylelint-config-bigchaindb": "^1.2.2",
"stylelint-config-css-modules": "^1.4.0", "stylelint-config-css-modules": "^1.4.0",
"stylelint-config-standard": "^18.3.0", "stylelint-config-standard": "^18.3.0",

View File

@ -439,9 +439,9 @@
"dev": true "dev": true
}, },
"@types/express": { "@types/express": {
"version": "4.16.1", "version": "4.17.0",
"resolved": "https://registry.npmjs.org/@types/express/-/express-4.16.1.tgz", "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.0.tgz",
"integrity": "sha512-V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg==", "integrity": "sha512-CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/body-parser": "*", "@types/body-parser": "*",
@ -450,9 +450,9 @@
} }
}, },
"@types/express-serve-static-core": { "@types/express-serve-static-core": {
"version": "4.16.6", "version": "4.16.7",
"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.6.tgz", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.7.tgz",
"integrity": "sha512-8wr3CA/EMybyb6/V8qvTRKiNkPmgUA26uA9XWD6hlA0yFDuqi4r2L0C2B0U2HAYltJamoYJszlkaWM31vrKsHg==", "integrity": "sha512-847KvL8Q1y3TtFLRTXcVakErLJQgdpFSaq+k043xefz9raEf0C7HalpSY7OW5PyjCnY8P7bPW5t/Co9qqp+USg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/node": "*", "@types/node": "*",
@ -494,9 +494,9 @@
} }
}, },
"@types/jest": { "@types/jest": {
"version": "24.0.13", "version": "24.0.15",
"resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.13.tgz", "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.15.tgz",
"integrity": "sha512-3m6RPnO35r7Dg+uMLj1+xfZaOgIHHHut61djNjzwExXN4/Pm9has9C6I1KMYSfz7mahDhWUOVg4HW/nZdv5Pww==", "integrity": "sha512-MU1HIvWUme74stAoc3mgAi+aMlgKOudgEvQDIm1v4RkrDudBh1T+NFp5sftpBAdXdx1J0PbdpJ+M2EsSOi1djA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/jest-diff": "*" "@types/jest-diff": "*"
@ -524,9 +524,9 @@
} }
}, },
"@types/node": { "@types/node": {
"version": "11.13.13", "version": "11.13.15",
"resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.13.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.15.tgz",
"integrity": "sha512-GFWH7e4Q/OGLAO545bupVju+nE1YtLSwYAdLfSzAXnTPqoqKoXCOEtB7Cluvg9B/h2nGLhyzCDyCInYvrOE2nw==", "integrity": "sha512-x6ypl5Uzly+j23hbxmMzf12Eb4lOhIEqQz0HuczpTUa1KIx1GpbN/o4E3aAED20UoEsdK0wvyY8QcffuWSLDkw==",
"dev": true "dev": true
}, },
"@types/range-parser": { "@types/range-parser": {
@ -1853,12 +1853,12 @@
} }
}, },
"express-validator": { "express-validator": {
"version": "5.3.1", "version": "6.0.1",
"resolved": "https://registry.npmjs.org/express-validator/-/express-validator-5.3.1.tgz", "resolved": "https://registry.npmjs.org/express-validator/-/express-validator-6.0.1.tgz",
"integrity": "sha512-g8xkipBF6VxHbO1+ksC7nxUU7+pWif0+OZXjZTybKJ/V0aTVhuCoHbyhIPgSYVldwQLocGExPtB2pE0DqK4jsw==", "integrity": "sha512-hrvN512QBs8zKm2vu33a0AxomZBiDl/0jAYxoq3lnGdXrbWBvObGYugt8jmdfZbzoFDlT2ZF8jhYYszyjtdOjw==",
"requires": { "requires": {
"lodash": "^4.17.10", "lodash": "^4.17.11",
"validator": "^10.4.0" "validator": "^11.0.0"
} }
}, },
"extend": { "extend": {
@ -5749,9 +5749,9 @@
} }
}, },
"ts-node": { "ts-node": {
"version": "8.2.0", "version": "8.3.0",
"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.2.0.tgz", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.3.0.tgz",
"integrity": "sha512-m8XQwUurkbYqXrKqr3WHCW310utRNvV5OnRVeISeea7LoCWVcdfeB/Ntl8JYWFh+WRoUAdBgESrzKochQt7sMw==", "integrity": "sha512-dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"arg": "^4.1.0", "arg": "^4.1.0",
@ -6031,9 +6031,9 @@
} }
}, },
"validator": { "validator": {
"version": "10.11.0", "version": "11.0.0",
"resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz", "resolved": "https://registry.npmjs.org/validator/-/validator-11.0.0.tgz",
"integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==" "integrity": "sha512-+wnGLYqaKV2++nUv60uGzUJyJQwYVOin6pn1tgEiFCeCQO60yeu3Og9/yPccbBX574kxIcEJicogkzx6s6eyag=="
}, },
"vary": { "vary": {
"version": "1.1.2", "version": "1.1.2",

View File

@ -17,7 +17,7 @@
"compression": "^1.7.4", "compression": "^1.7.4",
"debug": "^4.1.1", "debug": "^4.1.1",
"express": "^4.17.1", "express": "^4.17.1",
"express-validator": "^5.3.1", "express-validator": "^6.0.1",
"morgan": "^1.9.1", "morgan": "^1.9.1",
"request": "^2.88.0" "request": "^2.88.0"
}, },
@ -25,17 +25,17 @@
"@types/body-parser": "^1.17.0", "@types/body-parser": "^1.17.0",
"@types/compression": "0.0.36", "@types/compression": "0.0.36",
"@types/debug": "^4.1.4", "@types/debug": "^4.1.4",
"@types/express": "^4.16.1", "@types/express": "^4.17.0",
"@types/jest": "^24.0.13", "@types/jest": "^24.0.15",
"@types/morgan": "^1.7.35", "@types/morgan": "^1.7.35",
"@types/node": "^11.13.4", "@types/node": "^11.13.15",
"@types/request": "^2.48.1", "@types/request": "^2.48.1",
"@types/supertest": "^2.0.7", "@types/supertest": "^2.0.7",
"jest": "^24.8.0", "jest": "^24.8.0",
"nodemon": "^1.19.1", "nodemon": "^1.19.1",
"supertest": "^4.0.2", "supertest": "^4.0.2",
"ts-jest": "^24.0.2", "ts-jest": "^24.0.2",
"ts-node": "^8.2.0", "ts-node": "^8.3.0",
"typescript": "3.4.5" "typescript": "3.4.5"
}, },
"repository": { "repository": {