summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRash419 <rashesh.padia@collabora.com>2021-11-18 13:52:24 +0530
committerPranam Lashkari <plashkari628@gmail.com>2021-12-01 19:36:29 +0530
commit4fa39261038f4ed21eca26843277b271f8422176 (patch)
treedccfd3a2fadfb56e1512d7b604ad53b1f09a16a5
parentcypress: updated cypress to use WOPI endpoints (diff)
downloadonline-4fa39261038f4ed21eca26843277b271f8422176.tar.gz
online-4fa39261038f4ed21eca26843277b271f8422176.zip
cypress: enabled and updated multiuser test
Signed-off-by: Rash419 <rashesh.padia@collabora.com> Change-Id: Ib20c93ec9c45ce234ef974e0cb0bd5323873ac42
-rw-r--r--cypress_test/data/multiuser/cypress-multiuser.html7
-rw-r--r--cypress_test/integration_tests/multiuser/calc/repair_document_spec.js2
-rw-r--r--cypress_test/integration_tests/multiuser/calc/sheet_operations_spec.js2
-rw-r--r--cypress_test/integration_tests/multiuser/impress/repair_document_spec.js2
-rw-r--r--cypress_test/integration_tests/multiuser/writer/track_changes_spec.js2
5 files changed, 9 insertions, 6 deletions
diff --git a/cypress_test/data/multiuser/cypress-multiuser.html b/cypress_test/data/multiuser/cypress-multiuser.html
index 980d6fabcc..9a9e9f5503 100644
--- a/cypress_test/data/multiuser/cypress-multiuser.html
+++ b/cypress_test/data/multiuser/cypress-multiuser.html
@@ -24,8 +24,11 @@
function constructWopiUrl() {
var wopiUrl = window.location.protocol + "//" + window.location.host + window.location.pathname + "?";
wopiUrl = wopiUrl.replace("cypress-multiuser.html", "cool.html");
- var wopiSrc = window.location.protocol + "//" + window.location.host + "/wopi/files/" + encodeURIComponent(window.location.search.substring(window.location.search.indexOf("=")+2));
- wopiUrl = wopiUrl + "WOPISrc=" + wopiSrc;
+ var params = new URLSearchParams(window.location.search);
+ var filePath = params.get('file_path').substr(1);
+ params.delete('file_path');
+ var wopiSrc = window.location.protocol + "//" + window.location.host + "/wopi/files/" + encodeURIComponent(filePath);
+ wopiUrl = wopiUrl + "WOPISrc=" + wopiSrc + '&' + params.toString();
return wopiUrl
}
var wopiUrl = constructWopiUrl();
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 0207e47659..33d788b2dc 100644
--- a/cypress_test/integration_tests/multiuser/calc/repair_document_spec.js
+++ b/cypress_test/integration_tests/multiuser/calc/repair_document_spec.js
@@ -3,7 +3,7 @@
var helper = require('../../common/helper');
var calcHelper = require('../../common/calc_helper');
-describe.skip('Repair Document', function() {
+describe('Repair Document', function() {
var testFileName = 'repair_doc.ods';
beforeEach(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 fc2c2d1f6d..982927d6cf 100644
--- a/cypress_test/integration_tests/multiuser/calc/sheet_operations_spec.js
+++ b/cypress_test/integration_tests/multiuser/calc/sheet_operations_spec.js
@@ -2,7 +2,7 @@
var helper = require('../../common/helper');
-describe.skip('Multiuser sheet operations', function() {
+describe('Multiuser sheet operations', function() {
var testFileName = 'sheet_operations.ods';
beforeEach(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 164126a5a6..f28169af9c 100644
--- a/cypress_test/integration_tests/multiuser/impress/repair_document_spec.js
+++ b/cypress_test/integration_tests/multiuser/impress/repair_document_spec.js
@@ -1,7 +1,7 @@
/* global describe it cy beforeEach require afterEach */
var helper = require('../../common/helper');
-describe.skip('Repair Document', function() {
+describe('Repair Document', function() {
var testFileName = 'repair_doc.odp';
beforeEach(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 e9514ec8e8..3aa753639d 100644
--- a/cypress_test/integration_tests/multiuser/writer/track_changes_spec.js
+++ b/cypress_test/integration_tests/multiuser/writer/track_changes_spec.js
@@ -2,7 +2,7 @@
var helper = require('../../common/helper');
-describe.skip('Track Changes', function () {
+describe('Track Changes', function () {
var testFileName = 'track_changes.odt';
beforeEach(function () {