cypress: give each multiuser test unique document

Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: Ia46d0538430010e30649af76cb46846c90de8c1f

8 files changed, 22 insertions, 15 deletions

diff --git a/cypress_test/integration_tests/common/helper.js b/cypress_test/integration_tests/common/helper.js
index 8bc25cfa1b..2023123a1d 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -334,7 +334,7 @@ function loadTestDoc(fileName, subFolder, noFileCopy, isMultiUser, subsequentLoa
 	if (Cypress.env('INTEGRATION') === 'nextcloud') {
 		loadTestDocNextcloud(fileName, subFolder, subsequentLoad);
 	} else {
-		destFileName = loadTestDocNoIntegration(fileName, subFolder, noFileCopy, noRename);
+		destFileName = loadTestDocNoIntegration(fileName, subFolder, noFileCopy, isMultiUser, noRename);
 	}
 
 	// When dialog appears before document load (eg. macro warning, csv import options)
diff --git a/cypress_test/integration_tests/multiuser/calc/repair_document_spec.js b/cypress_test/integration_tests/multiuser/calc/repair_document_spec.js
index 9fc1320013..20a971a9c0 100644
--- a/cypress_test/integration_tests/multiuser/calc/repair_document_spec.js
+++ b/cypress_test/integration_tests/multiuser/calc/repair_document_spec.js
@@ -4,10 +4,11 @@ var helper = require('../../common/helper');
 var calcHelper = require('../../common/calc_helper');
 
 describe.skip('Repair Document', function() {
-	var testFileName = 'repair_doc.ods';
+	var origTestFileName = 'repair_doc.ods';
+	var testFileName;
 
 	beforeEach(function() {
-		helper.beforeAll(testFileName, 'calc', undefined, true);
+		testFileName = helper.beforeAll(origTestFileName, 'calc', undefined, true);
 	});
 
 	afterEach(function() {
diff --git a/cypress_test/integration_tests/multiuser/calc/sheet_operations_spec.js b/cypress_test/integration_tests/multiuser/calc/sheet_operations_spec.js
index 982927d6cf..fd3996e883 100644
--- a/cypress_test/integration_tests/multiuser/calc/sheet_operations_spec.js
+++ b/cypress_test/integration_tests/multiuser/calc/sheet_operations_spec.js
@@ -3,10 +3,11 @@
 var helper = require('../../common/helper');
 
 describe('Multiuser sheet operations', function() {
-	var testFileName = 'sheet_operations.ods';
+	var origTestFileName = 'sheet_operations.ods';
+	var testFileName;
 
 	beforeEach(function() {
-		helper.beforeAll(testFileName, 'calc', undefined, true);
+		testFileName = helper.beforeAll(origTestFileName, 'calc', undefined, true);
 	});
 
 	afterEach(function() {
diff --git a/cypress_test/integration_tests/multiuser/impress/repair_document_spec.js b/cypress_test/integration_tests/multiuser/impress/repair_document_spec.js
index b33eb44d44..6da35a2ae7 100644
--- a/cypress_test/integration_tests/multiuser/impress/repair_document_spec.js
+++ b/cypress_test/integration_tests/multiuser/impress/repair_document_spec.js
@@ -2,10 +2,11 @@
 
 var helper = require('../../common/helper');
 describe.skip('Repair Document', function() {
-	var testFileName = 'repair_doc.odp';
+	var origTestFileName = 'repair_doc.odp';
+	var testFileName;
 
 	beforeEach(function() {
-		helper.beforeAll(testFileName, 'impress', undefined, true);
+		testFileName = helper.beforeAll(origTestFileName, 'impress', undefined, true);
 	});
 
 	afterEach(function() {
diff --git a/cypress_test/integration_tests/multiuser/writer/paragraph_prop_spec.js b/cypress_test/integration_tests/multiuser/writer/paragraph_prop_spec.js
index 599c4d0090..1d969f48c5 100644
--- a/cypress_test/integration_tests/multiuser/writer/paragraph_prop_spec.js
+++ b/cypress_test/integration_tests/multiuser/writer/paragraph_prop_spec.js
@@ -3,10 +3,11 @@
 var helper = require('../../common/helper');
 
 describe('Change paragraph properties', function() {
-	var testFileName = 'paragraph_prop.odt';
+	var origTestFileName = 'paragraph_prop.odt';
+	var testFileName;
 
 	beforeEach(function() {
-		helper.beforeAll(testFileName, 'writer', undefined, true);
+		testFileName = helper.beforeAll(origTestFileName, 'writer', undefined, true);
 	});
 
 	afterEach(function() {
diff --git a/cypress_test/integration_tests/multiuser/writer/repair_document_spec.js b/cypress_test/integration_tests/multiuser/writer/repair_document_spec.js
index cb29bdbec3..fbc19f72ef 100644
--- a/cypress_test/integration_tests/multiuser/writer/repair_document_spec.js
+++ b/cypress_test/integration_tests/multiuser/writer/repair_document_spec.js
@@ -3,10 +3,11 @@
 var helper = require('../../common/helper');
 
 describe('Repair Document', function() {
-	var testFileName = 'repair_doc.odt';
+	var origTestFileName = 'repair_doc.odt';
+	var testFileName;
 
 	beforeEach(function() {
-		helper.beforeAll(testFileName, 'writer', undefined, true);
+		testFileName = helper.beforeAll(origTestFileName, 'writer', undefined, true);
 	});
 
 	afterEach(function() {
diff --git a/cypress_test/integration_tests/multiuser/writer/sidebar_visibility_spec.js b/cypress_test/integration_tests/multiuser/writer/sidebar_visibility_spec.js
index d2032505c1..5b73755a85 100644
--- a/cypress_test/integration_tests/multiuser/writer/sidebar_visibility_spec.js
+++ b/cypress_test/integration_tests/multiuser/writer/sidebar_visibility_spec.js
@@ -4,10 +4,11 @@ var helper = require('../../common/helper');
 var desktopHelper = require('../../common/desktop_helper');
 
 describe('Sidebar visibility', function() {
-	var testFileName = 'sidebar_visibility.odt';
+	var origTestFileName = 'sidebar_visibility.odt';
+	var testFileName;
 
 	beforeEach(function() {
-		helper.beforeAll(testFileName, 'writer', undefined, true);
+		testFileName = helper.beforeAll(origTestFileName, 'writer', undefined, true);
 	});
 
 	afterEach(function() {
diff --git a/cypress_test/integration_tests/multiuser/writer/track_changes_spec.js b/cypress_test/integration_tests/multiuser/writer/track_changes_spec.js
index 3aa753639d..b695aa9459 100644
--- a/cypress_test/integration_tests/multiuser/writer/track_changes_spec.js
+++ b/cypress_test/integration_tests/multiuser/writer/track_changes_spec.js
@@ -3,10 +3,11 @@
 var helper = require('../../common/helper');
 
 describe('Track Changes', function () {
-	var testFileName = 'track_changes.odt';
+	var origTestFileName = 'track_changes.odt';
+	var testFileName;
 
 	beforeEach(function () {
-		helper.beforeAll(testFileName, 'writer', undefined, true);
+		testFileName = helper.beforeAll(origTestFileName, 'writer', undefined, true);
 	});
 
 	afterEach(function () {