From 415b5e08fde96f0e091883d3deb2f640972d942b Mon Sep 17 00:00:00 2001 From: gadotroee <55343099+gadotroee@users.noreply.github.com> Date: Thu, 2 Jun 2022 13:21:44 +0300 Subject: [PATCH] Use Specific cypress version in the acceptance tests (#1125) --- acceptanceTests/extensions_test.go | 4 ++-- acceptanceTests/tap_test.go | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/acceptanceTests/extensions_test.go b/acceptanceTests/extensions_test.go index a5d9efc9c..8e0da9d30 100644 --- a/acceptanceTests/extensions_test.go +++ b/acceptanceTests/extensions_test.go @@ -105,7 +105,7 @@ func TestRedis(t *testing.T) { } } - RunCypressTests(t, "npx cypress run --spec \"cypress/integration/tests/Redis.js\"") + RunCypressTests(t, "npx cypress@9.5.4 run --spec \"cypress/integration/tests/Redis.js\"") } func TestAmqp(t *testing.T) { @@ -236,5 +236,5 @@ func TestAmqp(t *testing.T) { ch.Close() } - RunCypressTests(t, "npx cypress run --spec \"cypress/integration/tests/Rabbit.js\"") + RunCypressTests(t, "npx cypress@9.5.4 run --spec \"cypress/integration/tests/Rabbit.js\"") } diff --git a/acceptanceTests/tap_test.go b/acceptanceTests/tap_test.go index 0171df7fa..f140fde1a 100644 --- a/acceptanceTests/tap_test.go +++ b/acceptanceTests/tap_test.go @@ -78,7 +78,7 @@ func basicTapTest(t *testing.T, shouldCheckSrcAndDest bool, extraArgs... string) expectedPodsStr += fmt.Sprintf("Name:%vNamespace:%v", expectedPods[i].Name, expectedPods[i].Namespace) } - RunCypressTests(t, fmt.Sprintf("npx cypress run --spec \"cypress/integration/tests/UiTest.js\" --env entriesCount=%d,arrayDict=%v,shouldCheckSrcAndDest=%v", + RunCypressTests(t, fmt.Sprintf("npx cypress@9.5.4 run --spec \"cypress/integration/tests/UiTest.js\" --env entriesCount=%d,arrayDict=%v,shouldCheckSrcAndDest=%v", entriesCount, expectedPodsStr, shouldCheckSrcAndDest)) }) } @@ -135,7 +135,7 @@ func TestTapGuiPort(t *testing.T) { } } - RunCypressTests(t, fmt.Sprintf("npx cypress run --spec \"cypress/integration/tests/GuiPort.js\" --env name=%v,namespace=%v,port=%d", + RunCypressTests(t, fmt.Sprintf("npx cypress@9.5.4 run --spec \"cypress/integration/tests/GuiPort.js\" --env name=%v,namespace=%v,port=%d", "httpbin", "mizu-tests", guiPort)) }) } @@ -182,7 +182,7 @@ func TestTapAllNamespaces(t *testing.T) { return } - RunCypressTests(t, fmt.Sprintf("npx cypress run --spec \"cypress/integration/tests/MultipleNamespaces.js\" --env name1=%v,name2=%v,name3=%v,namespace1=%v,namespace2=%v,namespace3=%v", + RunCypressTests(t, fmt.Sprintf("npx cypress@9.5.4 run --spec \"cypress/integration/tests/MultipleNamespaces.js\" --env name1=%v,name2=%v,name3=%v,namespace1=%v,namespace2=%v,namespace3=%v", expectedPods[0].Name, expectedPods[1].Name, expectedPods[2].Name, expectedPods[0].Namespace, expectedPods[1].Namespace, expectedPods[2].Namespace)) } @@ -231,7 +231,7 @@ func TestTapMultipleNamespaces(t *testing.T) { return } - RunCypressTests(t, fmt.Sprintf("npx cypress run --spec \"cypress/integration/tests/MultipleNamespaces.js\" --env name1=%v,name2=%v,name3=%v,namespace1=%v,namespace2=%v,namespace3=%v", + RunCypressTests(t, fmt.Sprintf("npx cypress@9.5.4 run --spec \"cypress/integration/tests/MultipleNamespaces.js\" --env name1=%v,name2=%v,name3=%v,namespace1=%v,namespace2=%v,namespace3=%v", expectedPods[0].Name, expectedPods[1].Name, expectedPods[2].Name, expectedPods[0].Namespace, expectedPods[1].Namespace, expectedPods[2].Namespace)) } @@ -277,7 +277,7 @@ func TestTapRegex(t *testing.T) { return } - RunCypressTests(t, fmt.Sprintf("npx cypress run --spec \"cypress/integration/tests/Regex.js\" --env name=%v,namespace=%v", + RunCypressTests(t, fmt.Sprintf("npx cypress@9.5.4 run --spec \"cypress/integration/tests/Regex.js\" --env name=%v,namespace=%v", expectedPods[0].Name, expectedPods[0].Namespace)) } @@ -376,7 +376,7 @@ func TestTapRedact(t *testing.T) { } } - RunCypressTests(t, "npx cypress run --spec \"cypress/integration/tests/Redact.js\"") + RunCypressTests(t, "npx cypress@9.5.4 run --spec \"cypress/integration/tests/Redact.js\"") } func TestTapNoRedact(t *testing.T) { @@ -426,7 +426,7 @@ func TestTapNoRedact(t *testing.T) { } } - RunCypressTests(t, "npx cypress run --spec \"cypress/integration/tests/NoRedact.js\"") + RunCypressTests(t, "npx cypress@9.5.4 run --spec \"cypress/integration/tests/NoRedact.js\"") } func TestTapRegexMasking(t *testing.T) { @@ -479,7 +479,7 @@ func TestTapRegexMasking(t *testing.T) { } } - RunCypressTests(t, "npx cypress run --spec \"cypress/integration/tests/RegexMasking.js\"") + RunCypressTests(t, "npx cypress@9.5.4 run --spec \"cypress/integration/tests/RegexMasking.js\"") } @@ -541,7 +541,7 @@ func TestTapIgnoredUserAgents(t *testing.T) { } } - RunCypressTests(t, "npx cypress run --spec \"cypress/integration/tests/IgnoredUserAgents.js\"") + RunCypressTests(t, "npx cypress@9.5.4 run --spec \"cypress/integration/tests/IgnoredUserAgents.js\"") } func TestTapDumpLogs(t *testing.T) {