more test fixes

This commit is contained in:
Matthias Kretschmann 2019-10-28 16:22:01 +01:00
parent 3fb7358b77
commit fe4f2233f0
Signed by: m
GPG Key ID: 606EEEF3C479A91F
9 changed files with 1118 additions and 934 deletions

596
client/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -6,7 +6,7 @@
"scripts": { "scripts": {
"start": "react-scripts start", "start": "react-scripts start",
"build": "CI=false react-scripts --max_old_space_size=4096 build", "build": "CI=false react-scripts --max_old_space_size=4096 build",
"test": "react-scripts test --coverage --watchAll=false", "test": "CI=false react-scripts test --coverage --watchAll=false",
"test:watch": "react-scripts test --coverage", "test:watch": "react-scripts test --coverage",
"eject": "react-scripts eject", "eject": "react-scripts eject",
"coverage": "cat coverage/lcov.info | codacy-coverage --token 8801f827fe1144ffa85cd7da94f2bbf7", "coverage": "cat coverage/lcov.info | codacy-coverage --token 8801f827fe1144ffa85cd7da94f2bbf7",
@ -21,28 +21,28 @@
"bip39": "^3.0.2", "bip39": "^3.0.2",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"ethereum-blockies": "github:MyEtherWallet/blockies", "ethereum-blockies": "github:MyEtherWallet/blockies",
"filesize": "^4.1.2", "filesize": "^5.0.3",
"history": "^4.9.0", "history": "^4.10.1",
"ipfs": "^0.39.0", "ipfs": "^0.39.0",
"ipfs-http-client": "^39.0.2", "ipfs-http-client": "^39.0.2",
"is-url-superb": "^3.0.0", "is-url-superb": "^3.0.0",
"moment": "^2.24.0", "moment": "^2.24.0",
"query-string": "^6.8.2", "query-string": "^6.8.3",
"react": "^16.11.0", "react": "^16.11.0",
"react-collapsed": "^2.1.1", "react-collapsed": "^2.2.2",
"react-datepicker": "^2.8.0", "react-datepicker": "^2.9.6",
"react-dom": "^16.11.0", "react-dom": "^16.11.0",
"react-dotdotdot": "^1.3.1", "react-dotdotdot": "^1.3.1",
"react-dropzone": "^10.1.8", "react-dropzone": "^10.1.10",
"react-ga": "^2.6.0", "react-ga": "^2.7.0",
"react-helmet": "^5.2.1", "react-helmet": "^5.2.1",
"react-markdown": "^4.1.0", "react-markdown": "^4.2.2",
"react-modal": "^3.9.1", "react-modal": "^3.11.1",
"react-moment": "^0.9.2", "react-moment": "^0.9.6",
"react-paginate": "^6.3.0", "react-paginate": "^6.3.0",
"react-popper": "^1.3.3", "react-popper": "^1.3.4",
"react-router-dom": "^5.0.1", "react-router-dom": "^5.1.2",
"react-transition-group": "^4.2.1", "react-transition-group": "^4.3.0",
"shortid": "^2.2.15", "shortid": "^2.2.15",
"truffle-hdwallet-provider": "1.0.14", "truffle-hdwallet-provider": "1.0.14",
"web3": "1.2.1" "web3": "1.2.1"
@ -52,27 +52,27 @@
"@testing-library/jest-dom": "^4.2.0", "@testing-library/jest-dom": "^4.2.0",
"@testing-library/react": "^9.3.0", "@testing-library/react": "^9.3.0",
"@types/classnames": "^2.2.9", "@types/classnames": "^2.2.9",
"@types/filesize": "^4.1.0", "@types/filesize": "^4.2.0",
"@types/is-url": "^1.2.28", "@types/is-url": "^1.2.28",
"@types/jest": "^24.0.16", "@types/jest": "^24.0.20",
"@types/react": "^16.8.23", "@types/react": "^16.9.11",
"@types/react-datepicker": "^2.8.0", "@types/react-datepicker": "^2.9.3",
"@types/react-dom": "^16.8.5", "@types/react-dom": "^16.9.3",
"@types/react-dotdotdot": "^1.2.0", "@types/react-dotdotdot": "^1.2.0",
"@types/react-helmet": "^5.0.8", "@types/react-helmet": "^5.0.13",
"@types/react-modal": "^3.8.2", "@types/react-modal": "^3.10.0",
"@types/react-paginate": "^6.2.1", "@types/react-paginate": "^6.2.1",
"@types/react-router-dom": "^4.3.4", "@types/react-router-dom": "^5.1.0",
"@types/react-transition-group": "^4.2.0", "@types/react-transition-group": "^4.2.3",
"@types/shortid": "0.0.29", "@types/shortid": "0.0.29",
"@types/web3": "^1.0.20", "@types/web3": "^1.0.20",
"@typescript-eslint/eslint-plugin": "^2.4.0", "@typescript-eslint/eslint-plugin": "^2.6.0",
"eslint": "^5.16.0", "eslint": "^5.16.0",
"jest-mock-axios": "^3.1.0", "jest-mock-axios": "^3.1.2",
"node-sass": "^4.12.0", "node-sass": "^4.13.0",
"react-scripts": "^3.0.0", "react-scripts": "^3.0.0",
"source-map-explorer": "^2.0.1", "source-map-explorer": "^2.1.0",
"typescript": "^3.6.2" "typescript": "^3.6.4"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

View File

@ -11,11 +11,11 @@ describe('IPFS', () => {
}) })
it('HTTP API: files can be dropped', async () => { it('HTTP API: files can be dropped', async () => {
const { container, findByText, getByText } = render(ui) const { container, getByText } = render(ui)
expect(container).toBeInTheDocument() expect(container).toBeInTheDocument()
// wait for IPFS node // wait for IPFS node
await findByText(/Connected to /) await waitForElement(() => getByText(/Connected to /))
// drop a file // drop a file
const dropzoneInput = container.querySelector('.dropzone') const dropzoneInput = container.querySelector('.dropzone')

View File

@ -67,17 +67,17 @@ describe('Files', () => {
}) })
it('new IPFS file form can be opened and closed', async () => { it('new IPFS file form can be opened and closed', async () => {
const { container, getByText } = renderComponent() const { getByText } = renderComponent()
// open // open
fireEvent.click(getByText('+ Add to IPFS')) fireEvent.click(getByText('+ Add to IPFS'))
await waitForElement(() => getByText('- Cancel')) const text = await waitForElement(() => getByText(/Connected to /))
expect(container.querySelector('.ipfsForm')).toBeInTheDocument() expect(text).toBeInTheDocument()
// close // close
fireEvent.click(getByText('- Cancel')) fireEvent.click(getByText('- Cancel'))
await waitForElement(() => getByText('+ Add to IPFS')) await waitForElement(() => getByText('+ Add to IPFS'))
expect(container.querySelector('.ipfsForm')).not.toBeInTheDocument() expect(text).not.toBeInTheDocument()
}) })
it('item can be removed', async () => { it('item can be removed', async () => {

View File

@ -7,11 +7,11 @@
"dependencies": [ "dependencies": [
{ {
"name": "keeper-contracts", "name": "keeper-contracts",
"version": "~0.11.1" "version": "~0.12.6"
}, },
{ {
"name": "brizo", "name": "brizo",
"version": "~0.4.2" "version": "~0.4.5"
}, },
{ {
"name": "aquarius", "name": "aquarius",
@ -19,7 +19,7 @@
}, },
{ {
"name": "squid-js", "name": "squid-js",
"version": "~0.7.2" "version": "~0.8.0"
}, },
{ {
"name": "faucet", "name": "faucet",

1326
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -24,27 +24,27 @@
}, },
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {
"@release-it/bumper": "^1.0.3", "@release-it/bumper": "^1.0.5",
"@typescript-eslint/eslint-plugin": "^1.13.0", "@typescript-eslint/eslint-plugin": "^2.6.0",
"@typescript-eslint/parser": "^1.13.0", "@typescript-eslint/parser": "^2.6.0",
"auto-changelog": "^1.16.0", "auto-changelog": "^1.16.1",
"concurrently": "^4.1.2", "concurrently": "^5.0.0",
"cypress": "^3.4.1", "cypress": "^3.5.0",
"cypress-log-to-output": "^1.0.4", "cypress-log-to-output": "^1.0.7",
"eslint": "^5.16.0", "eslint": "^5.16.0",
"eslint-config-oceanprotocol": "1.4.0", "eslint-config-oceanprotocol": "1.4.0",
"eslint-config-prettier": "^6.1.0", "eslint-config-prettier": "^6.5.0",
"eslint-plugin-cypress": "^2.6.1", "eslint-plugin-cypress": "^2.7.0",
"eslint-plugin-prettier": "^3.1.0", "eslint-plugin-prettier": "^3.1.1",
"prettier": "^1.18.2", "prettier": "^1.18.2",
"prettier-stylelint": "^0.4.2", "prettier-stylelint": "^0.4.2",
"release-it": "^12.3.6", "release-it": "^12.4.3",
"start-server-and-test": "^1.10.0", "start-server-and-test": "^1.10.6",
"stylelint": "^10.1.0", "stylelint": "^11.1.1",
"stylelint-config-bigchaindb": "^1.2.2", "stylelint-config-bigchaindb": "^1.2.2",
"stylelint-config-css-modules": "^1.4.0", "stylelint-config-css-modules": "^1.5.0",
"stylelint-config-standard": "^18.3.0", "stylelint-config-standard": "^19.0.0",
"typescript": "^3.6.2" "typescript": "^3.6.4"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

View File

@ -514,9 +514,9 @@
} }
}, },
"@types/jest": { "@types/jest": {
"version": "24.0.18", "version": "24.0.20",
"resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.18.tgz", "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.20.tgz",
"integrity": "sha512-jcDDXdjTcrQzdN06+TSVsPPqxvsZA/5QkYfIZlq1JMw7FdP5AZylbOc+6B/cuDurctRe+MziUMtQ3xQdrbjqyQ==", "integrity": "sha512-M8ebEkOpykGdLoRrmew7UowTZ1DANeeP0HiSIChl/4DGgmnSC1ntitNtkyNSXjMTsZvXuaxJrxjImEnRWNPsPw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/jest-diff": "*" "@types/jest-diff": "*"
@ -544,9 +544,9 @@
} }
}, },
"@types/node": { "@types/node": {
"version": "12.7.3", "version": "12.11.7",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.3.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.11.7.tgz",
"integrity": "sha512-3SiLAIBkDWDg6vFo0+5YJyHPWU9uwu40Qe+v+0MH8wRKYBimHvvAOyk3EzMrD/TrIlLYfXrqDqrg913PynrMJQ==" "integrity": "sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA=="
}, },
"@types/range-parser": { "@types/range-parser": {
"version": "1.2.3", "version": "1.2.3",
@ -5819,9 +5819,9 @@
} }
}, },
"typescript": { "typescript": {
"version": "3.6.2", "version": "3.6.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.2.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.4.tgz",
"integrity": "sha512-lmQ4L+J6mnu3xweP8+rOrUwzmN+MRAj7TgtJtDaXE5PMyX2kCrklhg3rvOsOIfNeAWMQWO2F1GPc1kMD2vLAfw==", "integrity": "sha512-unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg==",
"dev": true "dev": true
}, },
"uglify-js": { "uglify-js": {

View File

@ -28,9 +28,9 @@
"@types/compression": "^1.0.1", "@types/compression": "^1.0.1",
"@types/debug": "^4.1.5", "@types/debug": "^4.1.5",
"@types/express": "^4.17.1", "@types/express": "^4.17.1",
"@types/jest": "^24.0.18", "@types/jest": "^24.0.20",
"@types/morgan": "^1.7.37", "@types/morgan": "^1.7.37",
"@types/node": "^12.7.3", "@types/node": "^12.11.7",
"@types/request": "^2.48.2", "@types/request": "^2.48.2",
"@types/supertest": "^2.0.8", "@types/supertest": "^2.0.8",
"jest": "^24.9.0", "jest": "^24.9.0",
@ -38,7 +38,7 @@
"supertest": "^4.0.2", "supertest": "^4.0.2",
"ts-jest": "^24.0.2", "ts-jest": "^24.0.2",
"ts-node": "^8.3.0", "ts-node": "^8.3.0",
"typescript": "^3.6.2" "typescript": "^3.6.4"
}, },
"repository": { "repository": {
"type": "git", "type": "git",