From d257cd349711c2afa0fbf6779b5a651cc7650386 Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Mon, 13 Jan 2025 08:32:55 +0530 Subject: [PATCH 1/3] Fix copy issue --- .../EmbedSettings/EmbedSettings_spec.js | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js b/app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js index d139fd045d7d..bcc567e76cd7 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js @@ -18,6 +18,8 @@ describe("Embed settings options", { tags: ["@tag.Settings"] }, function () { ); }; + let clipboardData; + function ValidateEditModeSetting(setting) { _.deployMode.NavigateBacktoEditor(); _.embedSettings.OpenEmbedSettings(); @@ -31,6 +33,7 @@ describe("Embed settings options", { tags: ["@tag.Settings"] }, function () { } before(() => { + _.agHelper.GiveChromeCopyPermission(); _.homePage.NavigateToHome(); _.homePage.CreateNewApplication(); _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.IFRAME); @@ -48,9 +51,25 @@ describe("Embed settings options", { tags: ["@tag.Settings"] }, function () { .click() .wait(1000); _.agHelper.ClickButton("Copy application url"); + cy.window().then((win) => { - cy.stub(win.navigator.clipboard, "writeText").as("deployUrl").resolves(); + new Cypress.Promise((resolve, reject) => { + win.navigator.clipboard + .readText() + .then(resolve) + .catch(reject); + }).then((text) => { + clipboardData = text; // Store the clipboard content in a variable + cy.log(`Clipboard Content: ${clipboardData}`); // Log clipboard content + expect(clipboardData).to.equal("Expected clipboard text"); // Add assertions if needed + }); }); + + // Log clipboard data after it's been set + cy.then(() => { + cy.log(`Stored Clipboard Data: ${clipboardData}`); + }); + cy.enablePublicAccess(); cy.wait(8000); //adding wait time for iframe to load fully! _.agHelper.RefreshPage(); @@ -67,10 +86,8 @@ describe("Embed settings options", { tags: ["@tag.Settings"] }, function () { cy.get(adminSettings.saveButton).click(); cy.waitForServerRestart(); _.agHelper.Sleep(2000); - cy.get("@deployUrl").then((depUrl) => { - cy.log("deployUrl is " + depUrl); - cy.visit(depUrl, { timeout: 60000 }); - }); + + cy.visit(clipboardData, { timeout: 60000 }); getIframeBody().contains("Submit").should("exist"); ValidateEditModeSetting(_.embedSettings.locators._restrictedText); // }); @@ -84,10 +101,7 @@ describe("Embed settings options", { tags: ["@tag.Settings"] }, function () { cy.get(adminSettings.saveButton).click(); cy.waitForServerRestart(); _.agHelper.Sleep(2000); - cy.get("@deployUrl").then((depUrl) => { - cy.log("deployUrl is " + depUrl); - cy.visit(depUrl, { timeout: 60000 }); - }); + cy.visit(clipboardData, { timeout: 60000 }); getIframeBody().contains("Submit").should("exist"); ValidateEditModeSetting(_.embedSettings.locators._allowAllText); // }); @@ -98,13 +112,11 @@ describe("Embed settings options", { tags: ["@tag.Settings"] }, function () { cy.get(".t--admin-settings-APPSMITH_ALLOWED_FRAME_ANCESTORS").within(() => { cy.get("input").last().click(); }); + cy.get(adminSettings.saveButton).click(); cy.waitForServerRestart(); _.agHelper.Sleep(2000); - cy.get("@deployUrl").then((depUrl) => { - cy.log("deployUrl is " + depUrl); - cy.visit(depUrl, { timeout: 60000 }); - }); + cy.visit(clipboardData, { timeout: 60000 }); getIframeBody().contains("Submit").should("not.exist"); ValidateEditModeSetting(_.embedSettings.locators._disabledText); From 65b4265f614a4b55a760cd21941b5c78897b1108 Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Mon, 13 Jan 2025 09:43:24 +0530 Subject: [PATCH 2/3] limited text file --- app/client/cypress/limited-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index 00e32a4629d0..dadb91f76005 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -2,6 +2,6 @@ #cypress/e2e/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js # For running all specs - uncomment below: #cypress/e2e/**/**/* -cypress/e2e/Regression/ClientSide/Anvil/Widgets/* +cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js #ci-test-limit uses this file to run minimum of specs. Do not run entire suite with this command. From e1903dbd34f17722bf798e4a79687cb6201a78ed Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Mon, 13 Jan 2025 10:18:01 +0530 Subject: [PATCH 3/3] reverted the change and prettier --- .../ClientSide/EmbedSettings/EmbedSettings_spec.js | 5 +---- app/client/cypress/limited-tests.txt | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js b/app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js index bcc567e76cd7..5502737bd610 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js @@ -54,10 +54,7 @@ describe("Embed settings options", { tags: ["@tag.Settings"] }, function () { cy.window().then((win) => { new Cypress.Promise((resolve, reject) => { - win.navigator.clipboard - .readText() - .then(resolve) - .catch(reject); + win.navigator.clipboard.readText().then(resolve).catch(reject); }).then((text) => { clipboardData = text; // Store the clipboard content in a variable cy.log(`Clipboard Content: ${clipboardData}`); // Log clipboard content diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index dadb91f76005..00e32a4629d0 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -2,6 +2,6 @@ #cypress/e2e/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js # For running all specs - uncomment below: #cypress/e2e/**/**/* -cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js +cypress/e2e/Regression/ClientSide/Anvil/Widgets/* #ci-test-limit uses this file to run minimum of specs. Do not run entire suite with this command.