From 10c86e6f096c442e9d5e3a37322fa591a3bf53ee Mon Sep 17 00:00:00 2001 From: Ramon Blanquer Date: Tue, 15 Mar 2022 13:24:11 +0100 Subject: [PATCH 1/2] feat: add explicit check against codeCoverage.expectFrontendCoverageOnly before attempting to collect backend coverage --- support.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support.js b/support.js index c99ceb23..3c806136 100644 --- a/support.js +++ b/support.js @@ -166,10 +166,11 @@ const registerHooks = () => { const baseUrl = Cypress.config('baseUrl') || cy.state('window').origin // @ts-ignore const runningEndToEndTests = baseUrl !== Cypress.config('proxyUrl') + const expectFrontendCoverageOnly = Cypress._.get(Cypress.env('codeCoverage'), 'expectFrontendCoverageOnly', false) const specType = Cypress._.get(Cypress.spec, 'specType', 'integration') const isIntegrationSpec = specType === 'integration' - if (runningEndToEndTests && isIntegrationSpec) { + if (!expectFrontendCoverageOnly && runningEndToEndTests && isIntegrationSpec) { // we can only request server-side code coverage // if we are running end-to-end tests, // otherwise where do we send the request? From 122a527a2b6851274f28f8205946fa568ef9fcc8 Mon Sep 17 00:00:00 2001 From: Ramon Blanquer Date: Tue, 15 Mar 2022 13:29:38 +0100 Subject: [PATCH 2/2] Run Prettier. --- support.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/support.js b/support.js index 3c806136..40c69dfc 100644 --- a/support.js +++ b/support.js @@ -166,11 +166,19 @@ const registerHooks = () => { const baseUrl = Cypress.config('baseUrl') || cy.state('window').origin // @ts-ignore const runningEndToEndTests = baseUrl !== Cypress.config('proxyUrl') - const expectFrontendCoverageOnly = Cypress._.get(Cypress.env('codeCoverage'), 'expectFrontendCoverageOnly', false) + const expectFrontendCoverageOnly = Cypress._.get( + Cypress.env('codeCoverage'), + 'expectFrontendCoverageOnly', + false + ) const specType = Cypress._.get(Cypress.spec, 'specType', 'integration') const isIntegrationSpec = specType === 'integration' - if (!expectFrontendCoverageOnly && runningEndToEndTests && isIntegrationSpec) { + if ( + !expectFrontendCoverageOnly && + runningEndToEndTests && + isIntegrationSpec + ) { // we can only request server-side code coverage // if we are running end-to-end tests, // otherwise where do we send the request?