From a54cb917d01ded118ca0152833d42a95d081b71b Mon Sep 17 00:00:00 2001 From: Adam Kol <93466081+AdamKol-up9@users.noreply.github.com> Date: Thu, 24 Feb 2022 15:55:30 +0200 Subject: [PATCH] Cypress: minimum entries check (#850) --- acceptanceTests/cypress.json | 1 - .../cypress/integration/testHelpers/TrafficHelper.js | 12 +++++++----- acceptanceTests/cypress/integration/tests/GuiPort.js | 3 --- .../cypress/integration/tests/IgnoredUserAgents.js | 3 --- .../cypress/integration/tests/NoRedact.js | 4 +--- acceptanceTests/cypress/integration/tests/Redact.js | 4 +--- .../cypress/integration/tests/RegexMasking.js | 4 +--- acceptanceTests/tap_test.go | 2 +- 8 files changed, 11 insertions(+), 22 deletions(-) diff --git a/acceptanceTests/cypress.json b/acceptanceTests/cypress.json index bdb63c4d1..d6757fcb3 100644 --- a/acceptanceTests/cypress.json +++ b/acceptanceTests/cypress.json @@ -24,7 +24,6 @@ "redactHeaderContent": "User-Header[REDACTED]", "redactBodyContent": "{ \"User\": \"[REDACTED]\" }", "regexMaskingBodyContent": "[REDACTED]", - "minimumEntries": 25, "greenFilterColor": "rgb(210, 250, 210)", "redFilterColor": "rgb(250, 214, 220)", "bodyJsonClass": ".hljs", diff --git a/acceptanceTests/cypress/integration/testHelpers/TrafficHelper.js b/acceptanceTests/cypress/integration/testHelpers/TrafficHelper.js index 4471e4a6a..a38953e66 100644 --- a/acceptanceTests/cypress/integration/testHelpers/TrafficHelper.js +++ b/acceptanceTests/cypress/integration/testHelpers/TrafficHelper.js @@ -25,14 +25,16 @@ export function resizeToNormalMizu() { } export function verifyMinimumEntries() { - const minimumEntries = Cypress.env('minimumEntries'); - it(`Making sure that mizu shows at least ${minimumEntries} entries`, async function () { + const entriesSent = Cypress.env('entriesCount'); + const minimumEntries = Math.round((0.75 * entriesSent)); + + it(`Making sure that mizu shows at least ${minimumEntries} entries`, function () { cy.get('#total-entries').then(number => { const getNum = () => { - const numOfEntries = number.text(); - return parseInt(numOfEntries); + return parseInt(number.text()); }; - cy.wrap({there: getNum}).invoke('there').should('be.gte', minimumEntries); + + cy.wrap({num: getNum}).invoke('num').should('be.gt', minimumEntries); }); }); } diff --git a/acceptanceTests/cypress/integration/tests/GuiPort.js b/acceptanceTests/cypress/integration/tests/GuiPort.js index 4cd0705e5..16627db19 100644 --- a/acceptanceTests/cypress/integration/tests/GuiPort.js +++ b/acceptanceTests/cypress/integration/tests/GuiPort.js @@ -1,5 +1,4 @@ import {findLineAndCheck, getExpectedDetailsDict} from "../testHelpers/StatusBarHelper"; -import {verifyMinimumEntries} from "../testHelpers/TrafficHelper"; it('check', function () { const podName = Cypress.env('name'), namespace = Cypress.env('namespace'); @@ -9,8 +8,6 @@ it('check', function () { cy.visit(`http://localhost:${port}`); cy.wait('@statusTap').its('response.statusCode').should('match', /^2\d{2}/); - verifyMinimumEntries(); - cy.get('.podsCount').trigger('mouseover'); findLineAndCheck(getExpectedDetailsDict(podName, namespace)); }); diff --git a/acceptanceTests/cypress/integration/tests/IgnoredUserAgents.js b/acceptanceTests/cypress/integration/tests/IgnoredUserAgents.js index b608d12ac..af49fc55c 100644 --- a/acceptanceTests/cypress/integration/tests/IgnoredUserAgents.js +++ b/acceptanceTests/cypress/integration/tests/IgnoredUserAgents.js @@ -2,15 +2,12 @@ import { checkThatAllEntriesShown, isValueExistsInElement, resizeToHugeMizu, - verifyMinimumEntries } from "../testHelpers/TrafficHelper"; it('Loading Mizu', function () { cy.visit(Cypress.env('testUrl')); }); -verifyMinimumEntries(); - checkEntries(); function checkEntries() { diff --git a/acceptanceTests/cypress/integration/tests/NoRedact.js b/acceptanceTests/cypress/integration/tests/NoRedact.js index d3e640a48..ef6648b4e 100644 --- a/acceptanceTests/cypress/integration/tests/NoRedact.js +++ b/acceptanceTests/cypress/integration/tests/NoRedact.js @@ -1,10 +1,8 @@ -import {isValueExistsInElement, verifyMinimumEntries} from '../testHelpers/TrafficHelper'; +import {isValueExistsInElement} from '../testHelpers/TrafficHelper'; it('Loading Mizu', function () { cy.visit(Cypress.env('testUrl')); }); -verifyMinimumEntries(); - isValueExistsInElement(false, Cypress.env('redactHeaderContent'), '#tbody-Headers'); isValueExistsInElement(false, Cypress.env('redactBodyContent'), Cypress.env('bodyJsonClass')); diff --git a/acceptanceTests/cypress/integration/tests/Redact.js b/acceptanceTests/cypress/integration/tests/Redact.js index 43f5d81e1..79db59b51 100644 --- a/acceptanceTests/cypress/integration/tests/Redact.js +++ b/acceptanceTests/cypress/integration/tests/Redact.js @@ -1,10 +1,8 @@ -import {isValueExistsInElement, verifyMinimumEntries} from '../testHelpers/TrafficHelper'; +import {isValueExistsInElement} from '../testHelpers/TrafficHelper'; it('Loading Mizu', function () { cy.visit(Cypress.env('testUrl')); }); -verifyMinimumEntries(); - isValueExistsInElement(true, Cypress.env('redactHeaderContent'), '#tbody-Headers'); isValueExistsInElement(true, Cypress.env('redactBodyContent'), Cypress.env('bodyJsonClass')); diff --git a/acceptanceTests/cypress/integration/tests/RegexMasking.js b/acceptanceTests/cypress/integration/tests/RegexMasking.js index c0f53e388..9f3f20fac 100644 --- a/acceptanceTests/cypress/integration/tests/RegexMasking.js +++ b/acceptanceTests/cypress/integration/tests/RegexMasking.js @@ -1,9 +1,7 @@ -import {isValueExistsInElement, verifyMinimumEntries} from "../testHelpers/TrafficHelper"; +import {isValueExistsInElement} from "../testHelpers/TrafficHelper"; it('Loading Mizu', function () { cy.visit(Cypress.env('testUrl')); }); -verifyMinimumEntries(); - isValueExistsInElement(true, Cypress.env('regexMaskingBodyContent'), Cypress.env('bodyJsonClass')); diff --git a/acceptanceTests/tap_test.go b/acceptanceTests/tap_test.go index 3840f7799..b27c2907b 100644 --- a/acceptanceTests/tap_test.go +++ b/acceptanceTests/tap_test.go @@ -62,7 +62,7 @@ func TestTap(t *testing.T) { } } - runCypressTests(t, "npx cypress run --spec \"cypress/integration/tests/UiTest.js\"") + runCypressTests(t, fmt.Sprintf("npx cypress run --spec \"cypress/integration/tests/UiTest.js\" --env entriesCount=%d", entriesCount)) }) } }