Merge pull request ToolJet#9348 from ToolJet/main

Merge main to develop

Author: akshaysasidrn

.version

@@ -1 +1 @@
-2.34.2
+2.35.0

cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/app-version/version.cy.js

@@ -37,18 +37,16 @@ describe("App Version Functionality", () => {
   let currentVersion = "";
   let newVersion = [];
   let versionFrom = "";
-  before(() => {
-    cy.apiLogin();
-    cy.apiCreateApp(data.appName);
-    cy.logoutApi();
-  });
+
   beforeEach(() => {
-    cy.apiLogin();
-    cy.visit('/my-workspace')
+    cy.defaultWorkspaceLogin();
+    cy.skipWalkthrough();
   })
 
   it("Verify the elements of the version module", () => {
-    navigateToAppEditor(data.appName);
+    data.appName = `${fake.companyName}-App`;
+    cy.apiCreateApp(data.appName);
+    cy.openApp()
     cy.get(appVersionSelectors.appVersionLabel).should("be.visible");
     cy.get(commonSelectors.appNameInput).verifyVisibleElement(
       "have.value",
@@ -68,9 +66,10 @@ describe("App Version Functionality", () => {
   });
 
   it("Verify all functionality for the app version", () => {
-    navigateToAppEditor(data.appName);
+    data.appName = `${fake.companyName}-App`;
+    cy.apiCreateApp(data.appName);
+    cy.openApp()
     cy.get('[data-cy="widget-list-box-table"]').should("be.visible");
-    cy.skipEditorPopover();
 
     cy.dragAndDropWidget("Toggle Switch", 50, 50);
     verifyComponent("toggleswitch1");

cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/userPermissions.cy.js

@@ -206,8 +206,7 @@ describe("User permissions", () => {
   it("Should verify Create/Update/Delete workspace variable permission", () => {
     common.navigateToWorkspaceVariable();
     cy.get('[data-cy="alert-info-text"]>>.text-muted').verifyVisibleElement(
-      "have.text",
-      "Workspace variables will no longer be supported after April 30, 2024. To maintain optimal performance, please make the switch to Workspace constants"
+      "have.text", "Can't add or edit workspace variables as we are deprecating them soon. Please use Workspace constant instead."
     );
     cy.get(
       '[data-cy="go-to-workspace-constants-option-button"]'

frontend/.version

@@ -1 +1 @@
-2.34.2
+2.35.0

server/.version

@@ -1 +1 @@
-2.34.2
+2.35.0