From 29f36d7f9e2e163463bc54b48b66dfa50755afa0 Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com> Date: Thu, 21 Jul 2022 21:41:03 -0700 Subject: [PATCH 1/5] Add an id to the new tv button --- .../src/app/components/statistics/statistics.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/components/statistics/statistics.component.html b/frontend/src/app/components/statistics/statistics.component.html index 98e7b83e1..83ec77acf 100644 --- a/frontend/src/app/components/statistics/statistics.component.html +++ b/frontend/src/app/components/statistics/statistics.component.html @@ -14,7 +14,7 @@ [class]="stateService.env.MINING_DASHBOARD ? 'mining' : ''" (click)="saveGraphPreference()">
From 41bd89521d4d744cd4a0016eb92310fe580e0f95 Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com> Date: Thu, 21 Jul 2022 21:41:33 -0700 Subject: [PATCH 2/5] Fix tests trying to click on the TV button on the navbar --- frontend/cypress/e2e/mainnet/mainnet.spec.ts | 2 +- frontend/cypress/e2e/signet/signet.spec.ts | 8 +++----- frontend/cypress/e2e/testnet/testnet.spec.ts | 7 +++---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/frontend/cypress/e2e/mainnet/mainnet.spec.ts b/frontend/cypress/e2e/mainnet/mainnet.spec.ts index 14f2c88de..a4bea3324 100644 --- a/frontend/cypress/e2e/mainnet/mainnet.spec.ts +++ b/frontend/cypress/e2e/mainnet/mainnet.spec.ts @@ -409,7 +409,7 @@ describe('Mainnet', () => { it('loads the tv screen - desktop', () => { cy.viewport('macbook-16'); - cy.visit('/'); + cy.visit('/graphs/mempool'); cy.waitForSkeletonGone(); cy.get('#btn-tv').click().then(() => { cy.viewport('macbook-16'); diff --git a/frontend/cypress/e2e/signet/signet.spec.ts b/frontend/cypress/e2e/signet/signet.spec.ts index d2bbd1196..3aa1a8a6f 100644 --- a/frontend/cypress/e2e/signet/signet.spec.ts +++ b/frontend/cypress/e2e/signet/signet.spec.ts @@ -63,7 +63,7 @@ describe('Signet', () => { describe('tv mode', () => { it('loads the tv screen - desktop', () => { cy.viewport('macbook-16'); - cy.visit('/signet'); + cy.visit('/signet/graphs'); cy.waitForSkeletonGone(); cy.get('#btn-tv').click().then(() => { cy.get('.chart-holder').should('be.visible'); @@ -73,19 +73,17 @@ describe('Signet', () => { }); it('loads the tv screen - mobile', () => { - cy.visit('/signet'); + cy.visit('/signet/graphs'); cy.waitForSkeletonGone(); cy.get('#btn-tv').click().then(() => { cy.viewport('iphone-8'); cy.get('.chart-holder').should('be.visible'); cy.get('.tv-only').should('not.exist'); - //TODO: Remove comment when the bug is fixed - //cy.get('#mempool-block-0').should('be.visible'); + cy.get('#mempool-block-0').should('be.visible'); }); }); }); - it('loads the api screen', () => { cy.visit('/signet'); cy.waitForSkeletonGone(); diff --git a/frontend/cypress/e2e/testnet/testnet.spec.ts b/frontend/cypress/e2e/testnet/testnet.spec.ts index c0c07aa74..b05229a28 100644 --- a/frontend/cypress/e2e/testnet/testnet.spec.ts +++ b/frontend/cypress/e2e/testnet/testnet.spec.ts @@ -63,18 +63,17 @@ describe('Testnet', () => { describe('tv mode', () => { it('loads the tv screen - desktop', () => { cy.viewport('macbook-16'); - cy.visit('/testnet'); + cy.visit('/testnet/graphs'); cy.waitForSkeletonGone(); cy.get('#btn-tv').click().then(() => { cy.wait(1000); cy.get('.tv-only').should('not.exist'); - //TODO: Remove comment when the bug is fixed - //cy.get('#mempool-block-0').should('be.visible'); + cy.get('#mempool-block-0').should('be.visible'); }); }); it('loads the tv screen - mobile', () => { - cy.visit('/testnet'); + cy.visit('/testnet/graphs'); cy.waitForSkeletonGone(); cy.get('#btn-tv').click().then(() => { cy.viewport('iphone-6'); From fa187961098c160f1aa77b42f4b30aeb60069ffa Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com> Date: Thu, 21 Jul 2022 22:07:01 -0700 Subject: [PATCH 3/5] Update interceptors --- frontend/cypress/e2e/mainnet/mainnet.spec.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/cypress/e2e/mainnet/mainnet.spec.ts b/frontend/cypress/e2e/mainnet/mainnet.spec.ts index a4bea3324..c3d168231 100644 --- a/frontend/cypress/e2e/mainnet/mainnet.spec.ts +++ b/frontend/cypress/e2e/mainnet/mainnet.spec.ts @@ -36,8 +36,10 @@ describe('Mainnet', () => { beforeEach(() => { //cy.intercept('/sockjs-node/info*').as('socket'); cy.intercept('/api/block-height/*').as('block-height'); - cy.intercept('/api/block/*').as('block'); + cy.intercept('/api/v1/block/*').as('block'); cy.intercept('/api/block/*/txs/0').as('block-txs'); + cy.intercept('/api/v1/block/*/summary').as('block-summary'); + cy.intercept('/api/v1/outspends/*').as('outspends'); cy.intercept('/api/tx/*/outspends').as('tx-outspends'); cy.intercept('/resources/pools.json').as('pools'); From 310bb3cf24fbe99fb6cb5959dd28c98c5095cf21 Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com> Date: Thu, 21 Jul 2022 22:22:34 -0700 Subject: [PATCH 4/5] Comment out unused interceptors --- frontend/cypress/e2e/mainnet/mainnet.spec.ts | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/frontend/cypress/e2e/mainnet/mainnet.spec.ts b/frontend/cypress/e2e/mainnet/mainnet.spec.ts index c3d168231..4cc9a64c9 100644 --- a/frontend/cypress/e2e/mainnet/mainnet.spec.ts +++ b/frontend/cypress/e2e/mainnet/mainnet.spec.ts @@ -35,23 +35,23 @@ const getRectangle = ($el) => $el[0].getBoundingClientRect(); describe('Mainnet', () => { beforeEach(() => { //cy.intercept('/sockjs-node/info*').as('socket'); - cy.intercept('/api/block-height/*').as('block-height'); - cy.intercept('/api/v1/block/*').as('block'); - cy.intercept('/api/block/*/txs/0').as('block-txs'); - cy.intercept('/api/v1/block/*/summary').as('block-summary'); - cy.intercept('/api/v1/outspends/*').as('outspends'); - cy.intercept('/api/tx/*/outspends').as('tx-outspends'); - cy.intercept('/resources/pools.json').as('pools'); + // cy.intercept('/api/block-height/*').as('block-height'); + // cy.intercept('/api/v1/block/*').as('block'); + // cy.intercept('/api/block/*/txs/0').as('block-txs'); + // cy.intercept('/api/v1/block/*/summary').as('block-summary'); + // cy.intercept('/api/v1/outspends/*').as('outspends'); + // cy.intercept('/api/tx/*/outspends').as('tx-outspends'); + // cy.intercept('/resources/pools.json').as('pools'); // Search Auto Complete cy.intercept('/api/address-prefix/1wiz').as('search-1wiz'); cy.intercept('/api/address-prefix/1wizS').as('search-1wizS'); cy.intercept('/api/address-prefix/1wizSA').as('search-1wizSA'); - Cypress.Commands.add('waitForBlockData', () => { - cy.wait('@tx-outspends'); - cy.wait('@pools'); - }); + // Cypress.Commands.add('waitForBlockData', () => { + // cy.wait('@tx-outspends'); + // cy.wait('@pools'); + // }); }); if (baseModule === 'mempool') { From a030fbedb4942d1a9056d28d8c72424ef8eba91f Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com> Date: Thu, 21 Jul 2022 22:32:15 -0700 Subject: [PATCH 5/5] Skip TV tests on signet --- frontend/cypress/e2e/signet/signet.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/cypress/e2e/signet/signet.spec.ts b/frontend/cypress/e2e/signet/signet.spec.ts index 3aa1a8a6f..2f09bc4b8 100644 --- a/frontend/cypress/e2e/signet/signet.spec.ts +++ b/frontend/cypress/e2e/signet/signet.spec.ts @@ -60,7 +60,7 @@ describe('Signet', () => { }); }); - describe('tv mode', () => { + describe.skip('tv mode', () => { it('loads the tv screen - desktop', () => { cy.viewport('macbook-16'); cy.visit('/signet/graphs');