From e7d88795e041d9e313a953ddf59de8b23177b395 Mon Sep 17 00:00:00 2001 From: Andrey Yamanov Date: Thu, 30 Jan 2025 11:57:07 +0100 Subject: [PATCH 1/2] chore: update cypress config --- packages/cubejs-testing/cypress.config.ts | 2 +- packages/cubejs-testing/cypress/e2e/rollup-designer.js | 4 ++++ packages/cubejs-testing/cypress/plugins/index.js | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/cubejs-testing/cypress.config.ts b/packages/cubejs-testing/cypress.config.ts index 17efe04102921..7b05d60ec52b4 100644 --- a/packages/cubejs-testing/cypress.config.ts +++ b/packages/cubejs-testing/cypress.config.ts @@ -20,6 +20,6 @@ export default defineConfig({ specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}', }, // set optimal values for the number of tests kept in memory - numTestsKeptInMemory: 10, + numTestsKeptInMemory: 5, experimentalMemoryManagement: true, }); diff --git a/packages/cubejs-testing/cypress/e2e/rollup-designer.js b/packages/cubejs-testing/cypress/e2e/rollup-designer.js index b8f027a6b1a12..06775d51c979a 100644 --- a/packages/cubejs-testing/cypress/e2e/rollup-designer.js +++ b/packages/cubejs-testing/cypress/e2e/rollup-designer.js @@ -3,11 +3,15 @@ import { ordersCountQuery } from "../queries"; context("Playground: Rollup Designer", () => { beforeEach(() => { + cy.wait(500); cy.restoreLocalStorage(); + cy.wait(500); }); afterEach(() => { + cy.wait(500); cy.saveLocalStorage(); + cy.wait(500); }); describe("Opens the Rollup Designer modal", () => { diff --git a/packages/cubejs-testing/cypress/plugins/index.js b/packages/cubejs-testing/cypress/plugins/index.js index fdc12939fead0..7d20a164c6929 100644 --- a/packages/cubejs-testing/cypress/plugins/index.js +++ b/packages/cubejs-testing/cypress/plugins/index.js @@ -21,5 +21,12 @@ const { addMatchImageSnapshotPlugin } = require('cypress-image-snapshot/plugin') module.exports = (on, config) => { addMatchImageSnapshotPlugin(on, config); + on('before:browser:launch', (browser = {}, launchOptions) => { + if (browser.name === 'chrome') { + launchOptions.args.push('--disable-gpu', '--disable-software-rasterizer'); + } + return launchOptions; + }); + return config; }; From 85121c3ca5c7d453239cee3863e07ea50804b804 Mon Sep 17 00:00:00 2001 From: Andrey Yamanov Date: Thu, 30 Jan 2025 12:00:57 +0100 Subject: [PATCH 2/2] chore: update cypress config * 2 --- packages/cubejs-testing/cypress.config.ts | 3 --- .../cubejs-testing/cypress/e2e/rollup-designer.js | 12 ------------ packages/cubejs-testing/cypress/plugins/index.js | 7 ------- 3 files changed, 22 deletions(-) diff --git a/packages/cubejs-testing/cypress.config.ts b/packages/cubejs-testing/cypress.config.ts index 7b05d60ec52b4..c6c76430688f7 100644 --- a/packages/cubejs-testing/cypress.config.ts +++ b/packages/cubejs-testing/cypress.config.ts @@ -19,7 +19,4 @@ export default defineConfig({ baseUrl: 'http://localhost:3080', specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}', }, - // set optimal values for the number of tests kept in memory - numTestsKeptInMemory: 5, - experimentalMemoryManagement: true, }); diff --git a/packages/cubejs-testing/cypress/e2e/rollup-designer.js b/packages/cubejs-testing/cypress/e2e/rollup-designer.js index 06775d51c979a..bc24391abd7cb 100644 --- a/packages/cubejs-testing/cypress/e2e/rollup-designer.js +++ b/packages/cubejs-testing/cypress/e2e/rollup-designer.js @@ -2,18 +2,6 @@ import { ordersCountQuery } from "../queries"; context("Playground: Rollup Designer", () => { - beforeEach(() => { - cy.wait(500); - cy.restoreLocalStorage(); - cy.wait(500); - }); - - afterEach(() => { - cy.wait(500); - cy.saveLocalStorage(); - cy.wait(500); - }); - describe("Opens the Rollup Designer modal", () => { it("opens the Rollup Designer without running a query", () => { cy.setQuery(ordersCountQuery); diff --git a/packages/cubejs-testing/cypress/plugins/index.js b/packages/cubejs-testing/cypress/plugins/index.js index 7d20a164c6929..fdc12939fead0 100644 --- a/packages/cubejs-testing/cypress/plugins/index.js +++ b/packages/cubejs-testing/cypress/plugins/index.js @@ -21,12 +21,5 @@ const { addMatchImageSnapshotPlugin } = require('cypress-image-snapshot/plugin') module.exports = (on, config) => { addMatchImageSnapshotPlugin(on, config); - on('before:browser:launch', (browser = {}, launchOptions) => { - if (browser.name === 'chrome') { - launchOptions.args.push('--disable-gpu', '--disable-software-rasterizer'); - } - return launchOptions; - }); - return config; };