Merge pull request #3206 from knorrium/update_cypress_v12_7_0
Update Cypress to v12.7.0
This commit is contained in:
		
						commit
						4256b1d418
					
				@ -1,4 +1,4 @@
 | 
			
		||||
import { defineConfig } from 'cypress'
 | 
			
		||||
import { defineConfig } from 'cypress';
 | 
			
		||||
 | 
			
		||||
export default defineConfig({
 | 
			
		||||
  projectId: 'ry4br7',
 | 
			
		||||
@ -12,12 +12,18 @@ export default defineConfig({
 | 
			
		||||
  },
 | 
			
		||||
  chromeWebSecurity: false,
 | 
			
		||||
  e2e: {
 | 
			
		||||
    // We've imported your old cypress plugins here.
 | 
			
		||||
    // You may want to clean this up later by importing these.
 | 
			
		||||
    setupNodeEvents(on, config) {
 | 
			
		||||
      return require('./cypress/plugins/index.js')(on, config)
 | 
			
		||||
    setupNodeEvents(on: any, config: any) {
 | 
			
		||||
      const fs = require('fs');
 | 
			
		||||
      const CONFIG_FILE = 'mempool-frontend-config.json';
 | 
			
		||||
      if (fs.existsSync(CONFIG_FILE)) {
 | 
			
		||||
        let contents = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
 | 
			
		||||
        config.env.BASE_MODULE = contents.BASE_MODULE ? contents.BASE_MODULE : 'mempool';
 | 
			
		||||
      } else {
 | 
			
		||||
        config.env.BASE_MODULE = 'mempool';
 | 
			
		||||
      }
 | 
			
		||||
      return config;
 | 
			
		||||
    },
 | 
			
		||||
    baseUrl: 'http://localhost:4200',
 | 
			
		||||
    specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
 | 
			
		||||
  },
 | 
			
		||||
})
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
@ -1,5 +1,5 @@
 | 
			
		||||
describe('Bisq', () => {
 | 
			
		||||
  const baseModule = Cypress.env("BASE_MODULE");
 | 
			
		||||
  const baseModule = Cypress.env('BASE_MODULE');
 | 
			
		||||
  const basePath = '';
 | 
			
		||||
 | 
			
		||||
  beforeEach(() => {
 | 
			
		||||
@ -20,7 +20,7 @@ describe('Bisq', () => {
 | 
			
		||||
      cy.waitForSkeletonGone();
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    describe("transactions", () => {
 | 
			
		||||
    describe('transactions', () => {
 | 
			
		||||
      it('loads the transactions screen', () => {
 | 
			
		||||
        cy.visit(`${basePath}`);
 | 
			
		||||
        cy.waitForSkeletonGone();
 | 
			
		||||
@ -30,9 +30,9 @@ describe('Bisq', () => {
 | 
			
		||||
      });
 | 
			
		||||
 | 
			
		||||
      const filters = [
 | 
			
		||||
        "Asset listing fee", "Blind vote", "Compensation request",
 | 
			
		||||
        "Genesis", "Irregular", "Lockup", "Pay trade fee", "Proof of burn",
 | 
			
		||||
        "Proposal", "Reimbursement request", "Transfer BSQ", "Unlock", "Vote reveal"
 | 
			
		||||
        'Asset listing fee', 'Blind vote', 'Compensation request',
 | 
			
		||||
        'Genesis', 'Irregular', 'Lockup', 'Pay trade fee', 'Proof of burn',
 | 
			
		||||
        'Proposal', 'Reimbursement request', 'Transfer BSQ', 'Unlock', 'Vote reveal'
 | 
			
		||||
      ];
 | 
			
		||||
      filters.forEach((filter) => {
 | 
			
		||||
        it.only(`filters the transaction screen by ${filter}`, () => {
 | 
			
		||||
@ -49,7 +49,7 @@ describe('Bisq', () => {
 | 
			
		||||
        });
 | 
			
		||||
      });
 | 
			
		||||
 | 
			
		||||
      it("filters using multiple criteria", () => {
 | 
			
		||||
      it('filters using multiple criteria', () => {
 | 
			
		||||
        const filters = ['Proposal', 'Lockup', 'Unlock'];
 | 
			
		||||
        cy.visit(`${basePath}/transactions`);
 | 
			
		||||
        cy.waitForSkeletonGone();
 | 
			
		||||
 | 
			
		||||
@ -1,5 +1,5 @@
 | 
			
		||||
describe('Liquid', () => {
 | 
			
		||||
  const baseModule = Cypress.env("BASE_MODULE");
 | 
			
		||||
  const baseModule = Cypress.env('BASE_MODULE');
 | 
			
		||||
  const basePath = '';
 | 
			
		||||
 | 
			
		||||
  beforeEach(() => {
 | 
			
		||||
 | 
			
		||||
@ -1,5 +1,5 @@
 | 
			
		||||
describe('Liquid Testnet', () => {
 | 
			
		||||
  const baseModule = Cypress.env("BASE_MODULE");
 | 
			
		||||
  const baseModule = Cypress.env('BASE_MODULE');
 | 
			
		||||
  const basePath = '/testnet';
 | 
			
		||||
 | 
			
		||||
  beforeEach(() => {
 | 
			
		||||
 | 
			
		||||
@ -1,6 +1,6 @@
 | 
			
		||||
import { emitMempoolInfo, dropWebSocket } from "../../support/websocket";
 | 
			
		||||
import { emitMempoolInfo, dropWebSocket } from '../../support/websocket';
 | 
			
		||||
 | 
			
		||||
const baseModule = Cypress.env("BASE_MODULE");
 | 
			
		||||
const baseModule = Cypress.env('BASE_MODULE');
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
//Credit: https://github.com/bahmutov/cypress-examples/blob/6cedb17f83a3bb03ded13cf1d6a3f0656ca2cdf5/docs/recipes/overlapping-elements.md
 | 
			
		||||
@ -339,14 +339,14 @@ describe('Mainnet', () => {
 | 
			
		||||
      cy.visit('/');
 | 
			
		||||
      cy.waitForSkeletonGone();
 | 
			
		||||
 | 
			
		||||
      cy.changeNetwork("testnet");
 | 
			
		||||
      cy.changeNetwork("signet");
 | 
			
		||||
      cy.changeNetwork("mainnet");
 | 
			
		||||
      cy.changeNetwork('testnet');
 | 
			
		||||
      cy.changeNetwork('signet');
 | 
			
		||||
      cy.changeNetwork('mainnet');
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    it.skip('loads the dashboard with the skeleton blocks', () => {
 | 
			
		||||
      cy.mockMempoolSocket();
 | 
			
		||||
      cy.visit("/");
 | 
			
		||||
      cy.visit('/');
 | 
			
		||||
      cy.get(':nth-child(1) > #bitcoin-block-0').should('be.visible');
 | 
			
		||||
      cy.get(':nth-child(2) > #bitcoin-block-0').should('be.visible');
 | 
			
		||||
      cy.get(':nth-child(3) > #bitcoin-block-0').should('be.visible');
 | 
			
		||||
 | 
			
		||||
@ -1,4 +1,4 @@
 | 
			
		||||
const baseModule = Cypress.env("BASE_MODULE");
 | 
			
		||||
const baseModule = Cypress.env('BASE_MODULE');
 | 
			
		||||
 | 
			
		||||
describe('Mainnet - Mining Features', () => {
 | 
			
		||||
  beforeEach(() => {
 | 
			
		||||
 | 
			
		||||
@ -1,6 +1,6 @@
 | 
			
		||||
import { emitMempoolInfo } from "../../support/websocket";
 | 
			
		||||
import { emitMempoolInfo } from '../../support/websocket';
 | 
			
		||||
 | 
			
		||||
const baseModule = Cypress.env("BASE_MODULE");
 | 
			
		||||
const baseModule = Cypress.env('BASE_MODULE');
 | 
			
		||||
 | 
			
		||||
describe('Signet', () => {
 | 
			
		||||
  beforeEach(() => {
 | 
			
		||||
@ -25,7 +25,7 @@ describe('Signet', () => {
 | 
			
		||||
 | 
			
		||||
    it.skip('loads the dashboard with the skeleton blocks', () => {
 | 
			
		||||
      cy.mockMempoolSocket();
 | 
			
		||||
      cy.visit("/signet");
 | 
			
		||||
      cy.visit('/signet');
 | 
			
		||||
      cy.get(':nth-child(1) > #bitcoin-block-0').should('be.visible');
 | 
			
		||||
      cy.get(':nth-child(2) > #bitcoin-block-0').should('be.visible');
 | 
			
		||||
      cy.get(':nth-child(3) > #bitcoin-block-0').should('be.visible');
 | 
			
		||||
@ -35,7 +35,7 @@ describe('Signet', () => {
 | 
			
		||||
 | 
			
		||||
      emitMempoolInfo({
 | 
			
		||||
        'params': {
 | 
			
		||||
          "network": "signet"
 | 
			
		||||
          'network': 'signet'
 | 
			
		||||
        }
 | 
			
		||||
      });
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,6 +1,6 @@
 | 
			
		||||
import { confirmAddress, emitMempoolInfo, sendWsMock, showNewTx, startTrackingAddress } from "../../support/websocket";
 | 
			
		||||
import { emitMempoolInfo } from '../../support/websocket';
 | 
			
		||||
 | 
			
		||||
const baseModule = Cypress.env("BASE_MODULE");
 | 
			
		||||
const baseModule = Cypress.env('BASE_MODULE');
 | 
			
		||||
 | 
			
		||||
describe('Testnet', () => {
 | 
			
		||||
  beforeEach(() => {
 | 
			
		||||
@ -25,7 +25,7 @@ describe('Testnet', () => {
 | 
			
		||||
 | 
			
		||||
    it.skip('loads the dashboard with the skeleton blocks', () => {
 | 
			
		||||
      cy.mockMempoolSocket();
 | 
			
		||||
      cy.visit("/testnet");
 | 
			
		||||
      cy.visit('/testnet');
 | 
			
		||||
      cy.get(':nth-child(1) > #bitcoin-block-0').should('be.visible');
 | 
			
		||||
      cy.get(':nth-child(2) > #bitcoin-block-0').should('be.visible');
 | 
			
		||||
      cy.get(':nth-child(3) > #bitcoin-block-0').should('be.visible');
 | 
			
		||||
 | 
			
		||||
@ -1,13 +0,0 @@
 | 
			
		||||
const fs = require('fs');
 | 
			
		||||
 | 
			
		||||
const CONFIG_FILE = 'mempool-frontend-config.json';
 | 
			
		||||
 | 
			
		||||
module.exports = (on, config) => {
 | 
			
		||||
  if (fs.existsSync(CONFIG_FILE)) {
 | 
			
		||||
    let contents = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
 | 
			
		||||
    config.env.BASE_MODULE = contents.BASE_MODULE ? contents.BASE_MODULE : 'mempool';
 | 
			
		||||
  } else {
 | 
			
		||||
    config.env.BASE_MODULE = 'mempool';
 | 
			
		||||
  }
 | 
			
		||||
  return config;
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										44
									
								
								frontend/package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										44
									
								
								frontend/package-lock.json
									
									
									
										generated
									
									
									
								
							@ -58,7 +58,7 @@
 | 
			
		||||
      },
 | 
			
		||||
      "optionalDependencies": {
 | 
			
		||||
        "@cypress/schematic": "^2.4.0",
 | 
			
		||||
        "cypress": "^12.3.0",
 | 
			
		||||
        "cypress": "^12.7.0",
 | 
			
		||||
        "cypress-fail-on-console-error": "~4.0.2",
 | 
			
		||||
        "cypress-wait-until": "^1.7.2",
 | 
			
		||||
        "mock-socket": "~9.1.5",
 | 
			
		||||
@ -7010,9 +7010,9 @@
 | 
			
		||||
      "peer": true
 | 
			
		||||
    },
 | 
			
		||||
    "node_modules/cypress": {
 | 
			
		||||
      "version": "12.3.0",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.3.0.tgz",
 | 
			
		||||
      "integrity": "sha512-ZQNebibi6NBt51TRxRMYKeFvIiQZ01t50HSy7z/JMgRVqBUey3cdjog5MYEbzG6Ktti5ckDt1tfcC47lmFwXkw==",
 | 
			
		||||
      "version": "12.7.0",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.7.0.tgz",
 | 
			
		||||
      "integrity": "sha512-7rq+nmhzz0u6yabCFyPtADU2OOrYt6pvUau9qV7xyifJ/hnsaw/vkr0tnLlcuuQKUAOC1v1M1e4Z0zG7S0IAvA==",
 | 
			
		||||
      "hasInstallScript": true,
 | 
			
		||||
      "optional": true,
 | 
			
		||||
      "dependencies": {
 | 
			
		||||
@ -7033,7 +7033,7 @@
 | 
			
		||||
        "commander": "^5.1.0",
 | 
			
		||||
        "common-tags": "^1.8.0",
 | 
			
		||||
        "dayjs": "^1.10.4",
 | 
			
		||||
        "debug": "^4.3.2",
 | 
			
		||||
        "debug": "^4.3.4",
 | 
			
		||||
        "enquirer": "^2.3.6",
 | 
			
		||||
        "eventemitter2": "6.4.7",
 | 
			
		||||
        "execa": "4.1.0",
 | 
			
		||||
@ -7159,6 +7159,23 @@
 | 
			
		||||
        "node": ">= 6"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "node_modules/cypress/node_modules/debug": {
 | 
			
		||||
      "version": "4.3.4",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
 | 
			
		||||
      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
 | 
			
		||||
      "optional": true,
 | 
			
		||||
      "dependencies": {
 | 
			
		||||
        "ms": "2.1.2"
 | 
			
		||||
      },
 | 
			
		||||
      "engines": {
 | 
			
		||||
        "node": ">=6.0"
 | 
			
		||||
      },
 | 
			
		||||
      "peerDependenciesMeta": {
 | 
			
		||||
        "supports-color": {
 | 
			
		||||
          "optional": true
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "node_modules/cypress/node_modules/execa": {
 | 
			
		||||
      "version": "4.1.0",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
 | 
			
		||||
@ -22276,9 +22293,9 @@
 | 
			
		||||
      "peer": true
 | 
			
		||||
    },
 | 
			
		||||
    "cypress": {
 | 
			
		||||
      "version": "12.3.0",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.3.0.tgz",
 | 
			
		||||
      "integrity": "sha512-ZQNebibi6NBt51TRxRMYKeFvIiQZ01t50HSy7z/JMgRVqBUey3cdjog5MYEbzG6Ktti5ckDt1tfcC47lmFwXkw==",
 | 
			
		||||
      "version": "12.7.0",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.7.0.tgz",
 | 
			
		||||
      "integrity": "sha512-7rq+nmhzz0u6yabCFyPtADU2OOrYt6pvUau9qV7xyifJ/hnsaw/vkr0tnLlcuuQKUAOC1v1M1e4Z0zG7S0IAvA==",
 | 
			
		||||
      "optional": true,
 | 
			
		||||
      "requires": {
 | 
			
		||||
        "@cypress/request": "^2.88.10",
 | 
			
		||||
@ -22298,7 +22315,7 @@
 | 
			
		||||
        "commander": "^5.1.0",
 | 
			
		||||
        "common-tags": "^1.8.0",
 | 
			
		||||
        "dayjs": "^1.10.4",
 | 
			
		||||
        "debug": "^4.3.2",
 | 
			
		||||
        "debug": "^4.3.4",
 | 
			
		||||
        "enquirer": "^2.3.6",
 | 
			
		||||
        "eventemitter2": "6.4.7",
 | 
			
		||||
        "execa": "4.1.0",
 | 
			
		||||
@ -22382,6 +22399,15 @@
 | 
			
		||||
          "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
 | 
			
		||||
          "optional": true
 | 
			
		||||
        },
 | 
			
		||||
        "debug": {
 | 
			
		||||
          "version": "4.3.4",
 | 
			
		||||
          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
 | 
			
		||||
          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
 | 
			
		||||
          "optional": true,
 | 
			
		||||
          "requires": {
 | 
			
		||||
            "ms": "2.1.2"
 | 
			
		||||
          }
 | 
			
		||||
        },
 | 
			
		||||
        "execa": {
 | 
			
		||||
          "version": "4.1.0",
 | 
			
		||||
          "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
 | 
			
		||||
 | 
			
		||||
@ -110,7 +110,7 @@
 | 
			
		||||
  },
 | 
			
		||||
  "optionalDependencies": {
 | 
			
		||||
    "@cypress/schematic": "^2.4.0",
 | 
			
		||||
    "cypress": "^12.3.0",
 | 
			
		||||
    "cypress": "^12.7.0",
 | 
			
		||||
    "cypress-fail-on-console-error": "~4.0.2",
 | 
			
		||||
    "cypress-wait-until": "^1.7.2",
 | 
			
		||||
    "mock-socket": "~9.1.5",
 | 
			
		||||
@ -119,4 +119,4 @@
 | 
			
		||||
  "scarfSettings": {
 | 
			
		||||
    "enabled": false
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user