From 1a6632e3772f9378172baf01a21c575ea79638e2 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Thu, 20 Jun 2024 16:23:41 +0530 Subject: [PATCH 1/5] temp: Test argos --- cypress/integration/rendering/quadrantChart.spec.js | 4 ++-- cypress/integration/rendering/xyChart.spec.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cypress/integration/rendering/quadrantChart.spec.js b/cypress/integration/rendering/quadrantChart.spec.js index 83a1455c6a..a72e533fa7 100644 --- a/cypress/integration/rendering/quadrantChart.spec.js +++ b/cypress/integration/rendering/quadrantChart.spec.js @@ -21,7 +21,7 @@ describe('Quadrant Chart', () => { quadrant-2 Need to promote quadrant-3 Re-evaluate quadrant-4 May be improved - Campaign A: [0.3, 0.6] + Campaign A: [0.3, 0.61] Campaign B: [0.45, 0.23] Campaign C: [0.57, 0.69] Campaign D: [0.78, 0.34] @@ -57,7 +57,7 @@ describe('Quadrant Chart', () => { x-axis Low Reach --> High Reach y-axis Low Engagement --> High Engagement quadrant-1 We should expand - quadrant-2 Need to promote + quadrant-2 Need to promot quadrant-3 Re-evaluate quadrant-4 May be improved `, diff --git a/cypress/integration/rendering/xyChart.spec.js b/cypress/integration/rendering/xyChart.spec.js index 85d998c50b..ec878c788f 100644 --- a/cypress/integration/rendering/xyChart.spec.js +++ b/cypress/integration/rendering/xyChart.spec.js @@ -216,7 +216,7 @@ describe('XY Chart', () => { title "Sales Revenue" x-axis Months [jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec] y-axis "Revenue (in $)" 4000 --> 11000 - bar [5000, 6000, 7500, 8200, 9500, 10500, 11000, 10200, 9200, 8500, 7000, 6000] + bar [5000, 6000, 7500, 8200, 9500, 10500, 11000, 10200, 9200, 8500, 7000, 6010] line [5000, 6000, 7500, 8200, 9500, 10500, 11000, 10200, 9200, 8500, 7000, 6000] `, {} @@ -260,7 +260,7 @@ describe('XY Chart', () => { title "Sales Revenue" x-axis Months [jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec] y-axis "Revenue (in $)" 4000 --> 11000 - bar [5000, 6000, 7500, 8200, 9500, 10500, 11000, 10200, 9200, 8500, 7000, 6000] + bar [5000, 6000, 7500, 8200, 9500, 10500, 11000, 10200, 9200, 8500, 7000, 5000] line [5000, 6000, 7500, 8200, 9500, 10500, 11000, 10200, 9200, 8500, 7000, 6000] `, {} @@ -282,7 +282,7 @@ describe('XY Chart', () => { title "Sales Revenue" x-axis Months [jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec] y-axis "Revenue (in $)" 4000 --> 11000 - bar [5000, 6000, 7500, 8200, 9500, 10500, 11000, 10200, 9200, 8500, 7000, 6000] + bar [5000, 6000, 7500, 8200, 9500, 10500, 11000, 10200, 9200, 8500, 7000, 6001] line [5000, 6000, 7500, 8200, 9500, 10500, 11000, 10200, 9200, 8500, 7000, 6000] `, {} From 3f58ebe063cdfafb7189cdff7164460faeb8cecf Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Thu, 20 Jun 2024 16:46:12 +0530 Subject: [PATCH 2/5] temp: Test argos --- cypress/integration/rendering/xyChart.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/integration/rendering/xyChart.spec.js b/cypress/integration/rendering/xyChart.spec.js index ec878c788f..4de69b373a 100644 --- a/cypress/integration/rendering/xyChart.spec.js +++ b/cypress/integration/rendering/xyChart.spec.js @@ -252,9 +252,9 @@ describe('XY Chart', () => { config: xyChart: xAxis: - showTick: false + showTick: true yAxis: - showTick: false + showTick: true --- xychart-beta title "Sales Revenue" From 364ccfe6a6b915d5ab762bba969c184f23279233 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Tue, 9 Jul 2024 13:15:12 +0530 Subject: [PATCH 3/5] feat: Add threshold to argos screenshot --- cypress/helpers/util.ts | 4 +++- package.json | 2 +- pnpm-lock.yaml | 28 ++++++++++++++-------------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/cypress/helpers/util.ts b/cypress/helpers/util.ts index 3ffba697a8..7045a1165c 100644 --- a/cypress/helpers/util.ts +++ b/cypress/helpers/util.ts @@ -124,7 +124,9 @@ export const verifyScreenshot = (name: string): void => { cy.log(`Closing eyes ${Cypress.spec.name}`); cy.eyesClose(); } else if (useArgos) { - cy.argosScreenshot(name); + cy.argosScreenshot(name, { + threshold: 0, + }); } else { cy.matchImageSnapshot(name); } diff --git a/package.json b/package.json index 9fb8a455ad..964be811d3 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ }, "devDependencies": { "@applitools/eyes-cypress": "^3.42.3", - "@argos-ci/cypress": "^2.0.5", + "@argos-ci/cypress": "^2.1.0", "@cspell/eslint-plugin": "^8.8.4", "@cypress/code-coverage": "^3.12.30", "@eslint/js": "^9.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2ce5783f85..d5ccb52b3c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: ^3.42.3 version: 3.43.1(encoding@0.1.13)(typescript@5.4.5) '@argos-ci/cypress': - specifier: ^2.0.5 - version: 2.0.5(cypress@13.7.3) + specifier: ^2.1.0 + version: 2.1.0(cypress@13.7.3) '@cspell/eslint-plugin': specifier: ^8.8.4 version: 8.9.1(eslint@9.6.0) @@ -744,18 +744,18 @@ packages: resolution: {integrity: sha512-4dpz76kW0KnXCYdxtkcdiaYUM4owmKtT9zPqrd1yPo+VuSNCNULyCZJ4mdy0aXWT716JLMMmIZ3AnQSkyaqvaA==} engines: {node: '>=18.0.0'} - '@argos-ci/core@2.3.0': - resolution: {integrity: sha512-0mHncBeOD7GFYfGZYUEcDgLyzsvPyxK/L1MROfAurFeWcw89ODG24JEdPsECtZBSCZMmMcK8XqeJIJkZsnDGZA==} + '@argos-ci/core@2.4.0': + resolution: {integrity: sha512-CY8IQsc71cuIeF2U47aePzH8+YWK4ePG1j+gK5aQ0r744Wc467U4xej7gChMVrAaGlZKsgoIIeXE1ezF+rCryw==} engines: {node: '>=18.0.0'} - '@argos-ci/cypress@2.0.5': - resolution: {integrity: sha512-pMM2+hGT8IE2XfWQpk4Mnf73K1B+97x0f1tkHrEpsopZBWmZy5nMZ0iqNLafJsRfo1LtZA8171oftPl5nEAz8g==} + '@argos-ci/cypress@2.1.0': + resolution: {integrity: sha512-EvzoWrX9owK40aeOcP3k3pMdML3m1PynLjDOGBtxWUG87gAGjsVd0rvVMTHQJTrCwhF4TRlqDv3vAllMWdZIAA==} engines: {node: '>=18.0.0'} peerDependencies: cypress: ^12.0.0 || ^13.0.0 - '@argos-ci/util@2.0.0': - resolution: {integrity: sha512-wnsNQOjcNfxOi8cHWSv8+GhzUeIitDJgjhuSNR9zrfHB0Y3nDVI57S/mHRo+EMAaWwghfbrxW1ypRCXVseN0GA==} + '@argos-ci/util@2.1.0': + resolution: {integrity: sha512-/78zJjZJCh3i7Eh3/lo7ybXK2pzXFGUNHbK3SgJNKNbFiBDllNRfy+x0kccjvN2gCCDz877jnFOlSoZZuMK56A==} engines: {node: '>=18.0.0'} '@babel/code-frame@7.24.2': @@ -9695,9 +9695,9 @@ snapshots: '@argos-ci/browser@2.1.2': {} - '@argos-ci/core@2.3.0': + '@argos-ci/core@2.4.0': dependencies: - '@argos-ci/util': 2.0.0 + '@argos-ci/util': 2.1.0 axios: 1.7.2(debug@4.3.5) convict: 6.2.4 debug: 4.3.5 @@ -9707,17 +9707,17 @@ snapshots: transitivePeerDependencies: - supports-color - '@argos-ci/cypress@2.0.5(cypress@13.7.3)': + '@argos-ci/cypress@2.1.0(cypress@13.7.3)': dependencies: '@argos-ci/browser': 2.1.2 - '@argos-ci/core': 2.3.0 - '@argos-ci/util': 2.0.0 + '@argos-ci/core': 2.4.0 + '@argos-ci/util': 2.1.0 cypress: 13.7.3 cypress-wait-until: 3.0.1 transitivePeerDependencies: - supports-color - '@argos-ci/util@2.0.0': {} + '@argos-ci/util@2.1.0': {} '@babel/code-frame@7.24.2': dependencies: From 8c99ee8da112111e0352301f2b74244e02e6e1f5 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Tue, 9 Jul 2024 13:31:56 +0530 Subject: [PATCH 4/5] chore: Update argosThreshold --- cypress/helpers/util.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/helpers/util.ts b/cypress/helpers/util.ts index 7045a1165c..61046551ee 100644 --- a/cypress/helpers/util.ts +++ b/cypress/helpers/util.ts @@ -125,7 +125,7 @@ export const verifyScreenshot = (name: string): void => { cy.eyesClose(); } else if (useArgos) { cy.argosScreenshot(name, { - threshold: 0, + threshold: 0.3, }); } else { cy.matchImageSnapshot(name); From 4f2005eec8980002f82df23d65a743f66e1d9d08 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Tue, 9 Jul 2024 13:41:03 +0530 Subject: [PATCH 5/5] chore: Update argosThreshold --- cypress/helpers/util.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/helpers/util.ts b/cypress/helpers/util.ts index 61046551ee..133a350328 100644 --- a/cypress/helpers/util.ts +++ b/cypress/helpers/util.ts @@ -125,7 +125,7 @@ export const verifyScreenshot = (name: string): void => { cy.eyesClose(); } else if (useArgos) { cy.argosScreenshot(name, { - threshold: 0.3, + threshold: 0.01, }); } else { cy.matchImageSnapshot(name);