Merge branch 'release' of github.com:appsmithorg/appsmith into PageRe…

…orderFix
appsmithorg · May 10, 2022 · 3874515 · 3874515
2 parents 8b75174 + 005c391
commit 3874515
Show file tree

Hide file tree

Showing 13 changed files with 2,116 additions and 285 deletions.
diff --git a/.github/config.json b/.github/config.json
diff --git a/app/client/cypress/fixtures/TableFilterImportApp.json b/app/client/cypress/fixtures/TableFilterImportApp.json
diff --git a/app/client/cypress/integration/Smoke_TestSuite/Application/CommunityIssues_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/Application/CommunityIssues_Spec.ts
@@ -193,7 +193,7 @@ describe("AForce - Community Issues page validations", function () {
     table.WaitUntilTableLoad()
 
     //One filter
-    table.FilterTable("Type", "is exactly", "Bug")
+    table.OpenNFilterTable("Type", "is exactly", "Bug")
     table.ReadTableRowColumnData(0, 1).then(($cellData) => {
       expect($cellData).to.eq("[Bug]: Postgres queries unable to execute with more than 9 placeholders");
     });
@@ -203,15 +203,15 @@ describe("AForce - Community Issues page validations", function () {
     table.RemoveFilterNVerify("Question", true, false)
 
     //Two filters - OR
-    table.FilterTable("Type", "starts with", "Trouble")
+    table.OpenNFilterTable("Type", "starts with", "Trouble")
     table.ReadTableRowColumnData(0, 0).then(($cellData) => {
       expect($cellData).to.eq("Troubleshooting");
     });
     table.ReadTableRowColumnData(0, 1).then(($cellData) => {
       expect($cellData).to.eq("Renew expired SSL certificate on a self-hosted instance");
     });
 
-    table.FilterTable("Title", "contains", "query", 'OR', 1)
+    table.OpenNFilterTable("Title", "contains", "query", 'OR', 1)
     table.ReadTableRowColumnData(1, 0).then(($cellData) => {
       expect($cellData).to.eq("Question");
     });
@@ -221,12 +221,12 @@ describe("AForce - Community Issues page validations", function () {
     table.RemoveFilterNVerify("Question", true, false)
 
      //Two filters - AND
-     table.FilterTable("Votes", "greater than", "3")
+     table.OpenNFilterTable("Votes", "greater than", "3")
      table.ReadTableRowColumnData(1, 1).then(($cellData) => {
        expect($cellData).to.eq("Combine queries from different datasources");
      });
 
-     table.FilterTable("Title", "contains", "button", 'AND', 1)
+     table.OpenNFilterTable("Title", "contains", "button", 'AND', 1)
      table.ReadTableRowColumnData(0, 1).then(($cellData) => {
        expect($cellData).to.eq("Change the video in the video player with a button click");
      });

diff --git a/...ypress/integration/Smoke_TestSuite/ClientSideTests/ActionExecution/Error_handling_spec.js b/...ypress/integration/Smoke_TestSuite/ClientSideTests/ActionExecution/Error_handling_spec.js
@@ -30,7 +30,11 @@ describe("Test Create Api and Bind to Table widget", function() {
 
     cy.PublishtheApp();
 
-    cy.get(publishPage.buttonWidget).click();
+    cy.wait(3000);
+    cy.get("span:contains('Submit')")
+      .closest("div")
+      .click();
+
     cy.wait("@postExecute").should(
       "have.nested.property",
       "response.body.responseMeta.status",
@@ -53,7 +57,11 @@ describe("Test Create Api and Bind to Table widget", function() {
 
     cy.PublishtheApp();
 
-    cy.get(publishPage.buttonWidget).click();
+    cy.wait(3000);
+    cy.get("span:contains('Submit')")
+      .closest("div")
+      .click();
+
     cy.wait("@postExecute").should(
       "have.nested.property",
       "response.body.responseMeta.status",

diff --git a/...t/cypress/integration/Smoke_TestSuite/ClientSideTests/ActionExecution/setInterval_spec.js b/...t/cypress/integration/Smoke_TestSuite/ClientSideTests/ActionExecution/setInterval_spec.js
@@ -62,15 +62,17 @@ describe("Test Create Api and Bind to Table widget", function() {
 
   it("works in the published version", () => {
     cy.PublishtheApp();
-
-    cy.get(publishPage.buttonWidget).click();
-
+    cy.wait(3000);
+    cy.get("span:contains('Submit')")
+      .closest("div")
+      .click();
     cy.wait("@postExecute").should(
       "have.nested.property",
       "response.body.responseMeta.status",
       200,
     );
-    cy.wait(5000);
+    cy.wait(3000);
+
     cy.wait("@postExecute").should(
       "have.nested.property",
       "response.body.responseMeta.status",

diff --git a/...t/cypress/integration/Smoke_TestSuite/ClientSideTests/AppThemingTests/App_Theming_spec.js b/...t/cypress/integration/Smoke_TestSuite/ClientSideTests/AppThemingTests/App_Theming_spec.js
diff --git a/...ation/Smoke_TestSuite/ClientSideTests/Binding/ButtonWidgets_NavigateTo_validation_spec.js b/...ation/Smoke_TestSuite/ClientSideTests/Binding/ButtonWidgets_NavigateTo_validation_spec.js
@@ -1,12 +1,8 @@
 const commonlocators = require("../../../../locators/commonlocators.json");
-const formWidgetsPage = require("../../../../locators/FormWidgets.json");
 const dsl = require("../../../../fixtures/buttondsl.json");
-const pages = require("../../../../locators/Pages.json");
 const widgetsPage = require("../../../../locators/Widgets.json");
 const publish = require("../../../../locators/publishWidgetspage.json");
 const testdata = require("../../../../fixtures/testdata.json");
-const dsl2 = require("../../../../fixtures/displayWidgetDsl.json");
-const explorer = require("../../../../locators/explorerlocators.json");
 
 describe("Binding the button Widgets and validating NavigateTo Page functionality", function() {
   before(() => {

diff --git a/...ent/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/IconButton_spec.js b/...ent/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/IconButton_spec.js
@@ -58,7 +58,8 @@ describe("Icon Button Widget Functionality", function() {
     cy.get(widgetsPage.iconWidgetBtn).click({ force: true });
     cy.get(commonlocators.toastmsg).contains("Icon Button Clicked");
     cy.PublishtheApp();
-    cy.get(publishPage.iconWidgetBtn).click({ force: true });
+    cy.wait(2000);
+    cy.get(publishPage.iconWidgetBtn).click();
     cy.get(commonlocators.toastmsg).contains("Icon Button Clicked");
     cy.goToEditFromPublish();
   });