diff --git a/app/client/cypress/integration/Regression_TestSuite/Application/ImportExportForkApplication_spec.js b/app/client/cypress/integration/Regression_TestSuite/Application/ImportExportForkApplication_spec.js
index b1de318c84..4ec6cdc35b 100644
--- a/app/client/cypress/integration/Regression_TestSuite/Application/ImportExportForkApplication_spec.js
+++ b/app/client/cypress/integration/Regression_TestSuite/Application/ImportExportForkApplication_spec.js
@@ -86,10 +86,10 @@ describe("Import, Export and Fork application and validate data binding", functi
const url = anchor.prop("href");
cy.request(url).then(({ body, headers }) => {
expect(headers).to.have.property("content-type", "application/json");
- expect(headers).to.have.property(
- "content-disposition",
- `attachment; filename*=UTF-8''${appName}.json`,
- );
+ expect(headers)
+ .to.have.property("content-disposition")
+ .that.includes("attachment;")
+ .and.includes(`filename*=UTF-8''${appName}.json`);
cy.writeFile("cypress/fixtures/exportedApp.json", body, "utf-8");
cy.generateUUID().then((uid) => {
workspaceId = uid;
diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/OtherUIFeatures/ExportApplication_spec.js b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/OtherUIFeatures/ExportApplication_spec.js
index c4c3e31552..fcf3e9131c 100644
--- a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/OtherUIFeatures/ExportApplication_spec.js
+++ b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/OtherUIFeatures/ExportApplication_spec.js
@@ -32,10 +32,10 @@ describe("Export application as a JSON file", function () {
const url = anchor.prop("href");
cy.request(url).then(({ headers }) => {
expect(headers).to.have.property("content-type", "application/json");
- expect(headers).to.have.property(
- "content-disposition",
- `attachment; filename*=UTF-8''${appname}.json`,
- );
+ expect(headers)
+ .to.have.property("content-disposition")
+ .that.includes("attachment;")
+ .and.includes(`filename*=UTF-8''${appname}.json`);
});
});
cy.LogOut();
diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Workspace/WorkspaceImportApplication_spec.js b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Workspace/WorkspaceImportApplication_spec.js
index 62ca06b666..c7a40240ec 100644
--- a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Workspace/WorkspaceImportApplication_spec.js
+++ b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Workspace/WorkspaceImportApplication_spec.js
@@ -25,10 +25,10 @@ describe("Workspace Import Application", function () {
const url = anchor.prop("href");
cy.request(url).then(({ body, headers }) => {
expect(headers).to.have.property("content-type", "application/json");
- expect(headers).to.have.property(
- "content-disposition",
- `attachment; filename*=UTF-8''${appname}.json`,
- );
+ expect(headers)
+ .to.have.property("content-disposition")
+ .that.includes("attachment;")
+ .and.includes(`filename*=UTF-8''${appname}.json`);
cy.writeFile("cypress/fixtures/exported-app.json", body, "utf-8");
cy.generateUUID().then((uid) => {
diff --git a/app/server/pom.xml b/app/server/pom.xml
index f4d3d48e91..e947ab879e 100644
--- a/app/server/pom.xml
+++ b/app/server/pom.xml
@@ -5,7 +5,7 @@