From 643d5a3c845a5524ca5de7d22d3cc37f518bfaed Mon Sep 17 00:00:00 2001 From: Jernej Pregelj Date: Tue, 25 Jun 2019 10:17:43 +0200 Subject: [PATCH] squid 0.6.1 --- client/package-lock.json | 6 +++--- client/package.json | 2 +- cypress/integration/consume.spec.js | 12 ++++++++++-- cypress/integration/faucet.spec.js | 6 +++++- cypress/integration/publish.spec.js | 6 +++++- cypress/integration/search.spec.js | 6 +++++- 6 files changed, 29 insertions(+), 9 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index e7d1edb..5e657df 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1296,9 +1296,9 @@ "integrity": "sha512-Nvnk9nNWMmfXz38bHRHHNgc8MGmFPZTkXPBWbEXR9+maJq5/kRFx8OckroKqmYXX4QBEh5frwd77omNOL2MUNw==" }, "@oceanprotocol/squid": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@oceanprotocol/squid/-/squid-0.6.0.tgz", - "integrity": "sha512-agTeWx4ownJzGelKLW8qPIrXyoG8JZNR5vGkMppGGLL+vIGYWp9c6FbzznA8A1j2t8g99juGWoxM7v+Jyeq5Ww==", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/@oceanprotocol/squid/-/squid-0.6.1.tgz", + "integrity": "sha512-GWkB4caaXK3F5iWnxg9XcJDsdNGNDO5+nG3EVqeYjZo8tGJ8+fAd8EbgXM/czRuzFWyd4kjgfXM6z60K50ovEQ==", "requires": { "@oceanprotocol/keeper-contracts": "^0.10.3", "bignumber.js": "^8.1.1", diff --git a/client/package.json b/client/package.json index ae00994..b405b0d 100644 --- a/client/package.json +++ b/client/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@oceanprotocol/art": "^2.2.0", - "@oceanprotocol/squid": "^0.6.0", + "@oceanprotocol/squid": "^0.6.1", "@oceanprotocol/typographies": "^0.1.0", "@sindresorhus/slugify": "^0.9.1", "axios": "^0.19.0", diff --git a/cypress/integration/consume.spec.js b/cypress/integration/consume.spec.js index a66a364..709afd9 100644 --- a/cypress/integration/consume.spec.js +++ b/cypress/integration/consume.spec.js @@ -6,14 +6,22 @@ context('Consume', () => { before(() => { cy.on('window:before:load', win => { const provider = new HDWalletProvider( - Cypress.env('SEEDPHRASE'), + 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://pacific.oceanprotocol.com' ) win.web3 = new Web3(provider) win.ethereum = win.web3 }) - cy.visit(Cypress.env('CONSUME_ASSET')) + cy.visit( + Cypress.env('CONSUME_ASSET') + ? Cypress.env('CONSUME_ASSET') + : 'http://localhost:3000/asset/did:op:66c9d023cd444999916570b5174d0f9037d8f85d24ba4c129e7f127f7c21aafa' + ) // Wait for end of loading cy.get('button', { timeout: 60000 }).should('have.length', 1) diff --git a/cypress/integration/faucet.spec.js b/cypress/integration/faucet.spec.js index 4ff018f..99245eb 100644 --- a/cypress/integration/faucet.spec.js +++ b/cypress/integration/faucet.spec.js @@ -6,8 +6,12 @@ context('Faucet', () => { before(() => { cy.on('window:before:load', win => { const provider = new HDWalletProvider( - Cypress.env('SEEDPHRASE'), + 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://pacific.oceanprotocol.com' ) win.web3 = new Web3(provider) win.ethereum = win.web3 diff --git a/cypress/integration/publish.spec.js b/cypress/integration/publish.spec.js index b0af350..dcab97c 100644 --- a/cypress/integration/publish.spec.js +++ b/cypress/integration/publish.spec.js @@ -6,8 +6,12 @@ context('Publish', () => { before(() => { cy.on('window:before:load', win => { const provider = new HDWalletProvider( - Cypress.env('SEEDPHRASE'), + 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://pacific.oceanprotocol.com' ) win.web3 = new Web3(provider) win.ethereum = win.web3 diff --git a/cypress/integration/search.spec.js b/cypress/integration/search.spec.js index fc490dd..3d9e44c 100644 --- a/cypress/integration/search.spec.js +++ b/cypress/integration/search.spec.js @@ -6,8 +6,12 @@ context('Search', () => { before(() => { cy.on('window:before:load', win => { const provider = new HDWalletProvider( - Cypress.env('SEEDPHRASE'), + 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://pacific.oceanprotocol.com' ) win.web3 = new Web3(provider) win.ethereum = win.web3