cypress_test/Makefile.am
| 10 +++++-----
cypress_test/integration_tests/multiuser/calc/sheet_operations_user1_spec.js
| 4 ++--
cypress_test/integration_tests/multiuser/calc/sheet_operations_user2_spec.js
| 4 ++--
cypress_test/integration_tests/multiuser/impress/slide_operations_user1_spec.js
| 6 +++---
cypress_test/integration_tests/multiuser/impress/slide_operations_user2_spec.js
| 6 +++---
cypress_test/integration_tests/multiuser/writer/paragraph_prop_user1_spec.js
| 4 ++--
cypress_test/integration_tests/multiuser/writer/paragraph_prop_user2_spec.js
| 4 ++--
cypress_test/integration_tests/multiuser/writer/sidebar_visibility_user1_spec.js
| 6 +++---
cypress_test/integration_tests/multiuser/writer/sidebar_visibility_user2_spec.js
| 4 ++--
cypress_test/integration_tests/multiuser/writer/simultaneous_typing_user1_spec.js
| 4 ++--
cypress_test/integration_tests/multiuser/writer/simultaneous_typing_user2_spec.js
| 4 ++--
11 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 9c312a4cc66ff6687a7b761341ac75de04abccda
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Fri Aug 7 14:59:09 2020 +0200
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Fri Aug 7 15:37:14 2020 +0200
cypress: group multi-user tests based on component.
Change-Id: Ic2689b8e05c9827807585a4a718f112e23d1e5a5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100324
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index a6ca20c2c..0c343e9eb 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -63,11 +63,11 @@ MOBILE_TEST_FILES=$(subst
$(MOBILE_TEST_FOLDER)/,,$(wildcard $(MOBILE_TEST_FOLDE
DEKSTOP_TEST_FILES=$(subst $(DESKTOP_TEST_FOLDER)/,,$(wildcard
$(DESKTOP_TEST_FOLDER)/*_spec.js) $(wildcard
$(DESKTOP_TEST_FOLDER)/*/*_spec.js))
MULTIUSER_TESTS= \
- paragraph_prop \
- sidebar_visibility \
- simultaneous_typing \
- sheet_operations \
- slide_operations
+ writer/paragraph_prop \
+ writer/sidebar_visibility \
+ writer/simultaneous_typing \
+ calc/sheet_operations \
+ impress/slide_operations
MOBILE_TEST_FILES_DONE= \
$(foreach
test_file,$(MOBILE_TEST_FILES),$(MOBILE_TRACK_FOLDER)/$(test_file).done)
diff --git a/cypress_test/data/multiuser/sheet_operations.ods
b/cypress_test/data/multiuser/calc/sheet_operations.ods
similarity index 100%
rename from cypress_test/data/multiuser/sheet_operations.ods
rename to cypress_test/data/multiuser/calc/sheet_operations.ods
diff --git a/cypress_test/data/multiuser/slide_operations.odp
b/cypress_test/data/multiuser/impress/slide_operations.odp
similarity index 100%
rename from cypress_test/data/multiuser/slide_operations.odp
rename to cypress_test/data/multiuser/impress/slide_operations.odp
diff --git a/cypress_test/data/multiuser/paragraph_prop.odt
b/cypress_test/data/multiuser/writer/paragraph_prop.odt
similarity index 100%
rename from cypress_test/data/multiuser/paragraph_prop.odt
rename to cypress_test/data/multiuser/writer/paragraph_prop.odt
diff --git a/cypress_test/data/multiuser/sidebar_visibility.odt
b/cypress_test/data/multiuser/writer/sidebar_visibility.odt
similarity index 100%
rename from cypress_test/data/multiuser/sidebar_visibility.odt
rename to cypress_test/data/multiuser/writer/sidebar_visibility.odt
diff --git a/cypress_test/data/multiuser/simultaneous_typing.odt
b/cypress_test/data/multiuser/writer/simultaneous_typing.odt
similarity index 100%
rename from cypress_test/data/multiuser/simultaneous_typing.odt
rename to cypress_test/data/multiuser/writer/simultaneous_typing.odt
diff --git
a/cypress_test/integration_tests/multiuser/sheet_operations_user1_spec.js
b/cypress_test/integration_tests/multiuser/calc/sheet_operations_user1_spec.js
similarity index 92%
rename from
cypress_test/integration_tests/multiuser/sheet_operations_user1_spec.js
rename to
cypress_test/integration_tests/multiuser/calc/sheet_operations_user1_spec.js
index c78f839fa..5773e2926 100644
--- a/cypress_test/integration_tests/multiuser/sheet_operations_user1_spec.js
+++
b/cypress_test/integration_tests/multiuser/calc/sheet_operations_user1_spec.js
@@ -1,12 +1,12 @@
/* global describe it cy beforeEach require afterEach */
-var helper = require('../common/helper');
+var helper = require('../../common/helper');
describe('Sheet operations: user-1.', function() {
var testFileName = 'sheet_operations.ods';
beforeEach(function() {
- helper.beforeAll(testFileName);
+ helper.beforeAll(testFileName, 'calc');
});
afterEach(function() {
diff --git
a/cypress_test/integration_tests/multiuser/sheet_operations_user2_spec.js
b/cypress_test/integration_tests/multiuser/calc/sheet_operations_user2_spec.js
similarity index 92%
rename from
cypress_test/integration_tests/multiuser/sheet_operations_user2_spec.js
rename to
cypress_test/integration_tests/multiuser/calc/sheet_operations_user2_spec.js
index 266a34965..6cc9cf8cb 100644
--- a/cypress_test/integration_tests/multiuser/sheet_operations_user2_spec.js
+++
b/cypress_test/integration_tests/multiuser/calc/sheet_operations_user2_spec.js
@@ -1,6 +1,6 @@
/* global describe it cy beforeEach require afterEach */
-var helper = require('../common/helper');
+var helper = require('../../common/helper');
describe('Sheet operations: user-2.', function() {
var testFileName = 'sheet_operations.ods';
@@ -9,7 +9,7 @@ describe('Sheet operations: user-2.', function() {
// Wait here, before loading the document.
// Opening two clients at the same time causes an issue.
cy.wait(5000);
- helper.beforeAll(testFileName, undefined, true);
+ helper.beforeAll(testFileName, 'calc', true);
});
afterEach(function() {
diff --git
a/cypress_test/integration_tests/multiuser/slide_operations_user1_spec.js
b/cypress_test/integration_tests/multiuser/impress/slide_operations_user1_spec.js
similarity index 84%
rename from
cypress_test/integration_tests/multiuser/slide_operations_user1_spec.js
rename to
cypress_test/integration_tests/multiuser/impress/slide_operations_user1_spec.js
index 640102cd6..4903b9f2d 100644
--- a/cypress_test/integration_tests/multiuser/slide_operations_user1_spec.js
+++
b/cypress_test/integration_tests/multiuser/impress/slide_operations_user1_spec.js
@@ -1,13 +1,13 @@
/* global describe it cy beforeEach require afterEach */
-var helper = require('../common/helper');
-var impressHelper = require('../common/impress_helper');
+var helper = require('../../common/helper');
+var impressHelper = require('../../common/impress_helper');
describe('Slide operations: user-1.', function() {
var testFileName = 'slide_operations.odp';
beforeEach(function() {
- helper.beforeAll(testFileName);
+ helper.beforeAll(testFileName, 'impress');
});
afterEach(function() {
diff --git
a/cypress_test/integration_tests/multiuser/slide_operations_user2_spec.js
b/cypress_test/integration_tests/multiuser/impress/slide_operations_user2_spec.js
similarity index 87%
rename from
cypress_test/integration_tests/multiuser/slide_operations_user2_spec.js
rename to
cypress_test/integration_tests/multiuser/impress/slide_operations_user2_spec.js
index 476d26196..4f8124bd5 100644
--- a/cypress_test/integration_tests/multiuser/slide_operations_user2_spec.js
+++
b/cypress_test/integration_tests/multiuser/impress/slide_operations_user2_spec.js
@@ -1,7 +1,7 @@
/* global describe it cy beforeEach require afterEach */
-var helper = require('../common/helper');
-var impressHelper = require('../common/impress_helper');
+var helper = require('../../common/helper');
+var impressHelper = require('../../common/impress_helper');
describe('Slide operations: user-2.', function() {
var testFileName = 'slide_operations.odp';
@@ -10,7 +10,7 @@ describe('Slide operations: user-2.', function() {
// Wait here, before loading the document.
// Opening two clients at the same time causes an issue.
cy.wait(5000);
- helper.beforeAll(testFileName, undefined, true);
+ helper.beforeAll(testFileName, 'impress', true);
});
afterEach(function() {
diff --git
a/cypress_test/integration_tests/multiuser/paragraph_prop_user1_spec.js
b/cypress_test/integration_tests/multiuser/writer/paragraph_prop_user1_spec.js
similarity index 90%
rename from
cypress_test/integration_tests/multiuser/paragraph_prop_user1_spec.js
rename to
cypress_test/integration_tests/multiuser/writer/paragraph_prop_user1_spec.js
index 225af99d1..c92b94371 100644
--- a/cypress_test/integration_tests/multiuser/paragraph_prop_user1_spec.js
+++
b/cypress_test/integration_tests/multiuser/writer/paragraph_prop_user1_spec.js
@@ -1,12 +1,12 @@
/* global describe it cy beforeEach require afterEach */
-var helper = require('../common/helper');
+var helper = require('../../common/helper');
describe('Change paragraph properties: user-1.', function() {
var testFileName = 'paragraph_prop.odt';
beforeEach(function() {
- helper.beforeAll(testFileName);
+ helper.beforeAll(testFileName, 'writer');
});
afterEach(function() {
diff --git
a/cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js
b/cypress_test/integration_tests/multiuser/writer/paragraph_prop_user2_spec.js
similarity index 89%
rename from
cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js
rename to
cypress_test/integration_tests/multiuser/writer/paragraph_prop_user2_spec.js
index 0f2b05198..4dce2446a 100644
--- a/cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js
+++
b/cypress_test/integration_tests/multiuser/writer/paragraph_prop_user2_spec.js
@@ -1,6 +1,6 @@
/* global describe it cy beforeEach require afterEach */
-var helper = require('../common/helper');
+var helper = require('../../common/helper');
describe('Change paragraph properties: user-2.', function() {
var testFileName = 'paragraph_prop.odt';
@@ -9,7 +9,7 @@ describe('Change paragraph properties: user-2.', function() {
// Wait here, before loading the document.
// Opening two clients at the same time causes an issue.
cy.wait(5000);
- helper.beforeAll(testFileName, undefined, true);
+ helper.beforeAll(testFileName, 'writer', true);
});
afterEach(function() {
diff --git
a/cypress_test/integration_tests/multiuser/sidebar_visibility_user1_spec.js
b/cypress_test/integration_tests/multiuser/writer/sidebar_visibility_user1_spec.js
similarity index 90%
rename from
cypress_test/integration_tests/multiuser/sidebar_visibility_user1_spec.js
rename to
cypress_test/integration_tests/multiuser/writer/sidebar_visibility_user1_spec.js
index 3d252a0da..75dda6343 100644
--- a/cypress_test/integration_tests/multiuser/sidebar_visibility_user1_spec.js
+++
b/cypress_test/integration_tests/multiuser/writer/sidebar_visibility_user1_spec.js
@@ -1,13 +1,13 @@
/* global describe it cy beforeEach require afterEach */
-var helper = require('../common/helper');
-var desktopHelper = require('../common/desktop_helper');
+var helper = require('../../common/helper');
+var desktopHelper = require('../../common/desktop_helper');
describe('Sidebar visibility: user-1.', function() {
var testFileName = 'sidebar_visibility.odt';
beforeEach(function() {
- helper.beforeAll(testFileName);
+ helper.beforeAll(testFileName, 'writer');
});
afterEach(function() {
diff --git
a/cypress_test/integration_tests/multiuser/sidebar_visibility_user2_spec.js
b/cypress_test/integration_tests/multiuser/writer/sidebar_visibility_user2_spec.js
similarity index 93%
rename from
cypress_test/integration_tests/multiuser/sidebar_visibility_user2_spec.js
rename to
cypress_test/integration_tests/multiuser/writer/sidebar_visibility_user2_spec.js
index 37c6b6e66..926f98ada 100644
--- a/cypress_test/integration_tests/multiuser/sidebar_visibility_user2_spec.js
+++
b/cypress_test/integration_tests/multiuser/writer/sidebar_visibility_user2_spec.js
@@ -1,6 +1,6 @@
/* global describe it cy beforeEach require afterEach */
-var helper = require('../common/helper');
+var helper = require('../../common/helper');
describe('Sidebar visibility: user-2.', function() {
var testFileName = 'sidebar_visibility.odt';
@@ -9,7 +9,7 @@ describe('Sidebar visibility: user-2.', function() {
// Wait here, before loading the document.
// Opening two clients at the same time causes an issue.
cy.wait(5000);
- helper.beforeAll(testFileName, undefined, true);
+ helper.beforeAll(testFileName, 'writer', true);
});
afterEach(function() {
diff --git
a/cypress_test/integration_tests/multiuser/simultaneous_typing_user1_spec.js
b/cypress_test/integration_tests/multiuser/writer/simultaneous_typing_user1_spec.js
similarity index 92%
rename from
cypress_test/integration_tests/multiuser/simultaneous_typing_user1_spec.js
rename to
cypress_test/integration_tests/multiuser/writer/simultaneous_typing_user1_spec.js
index a4c238854..517b98b48 100644
--- a/cypress_test/integration_tests/multiuser/simultaneous_typing_user1_spec.js
+++
b/cypress_test/integration_tests/multiuser/writer/simultaneous_typing_user1_spec.js
@@ -1,12 +1,12 @@
/* global describe it cy beforeEach require afterEach */
-var helper = require('../common/helper');
+var helper = require('../../common/helper');
describe('Simultaneous typing: user-1.', function() {
var testFileName = 'simultaneous_typing.odt';
beforeEach(function() {
- helper.beforeAll(testFileName);
+ helper.beforeAll(testFileName, 'writer');
});
afterEach(function() {
diff --git
a/cypress_test/integration_tests/multiuser/simultaneous_typing_user2_spec.js
b/cypress_test/integration_tests/multiuser/writer/simultaneous_typing_user2_spec.js
similarity index 92%
rename from
cypress_test/integration_tests/multiuser/simultaneous_typing_user2_spec.js
rename to
cypress_test/integration_tests/multiuser/writer/simultaneous_typing_user2_spec.js
index 4733949ef..d8cc961c7 100644
--- a/cypress_test/integration_tests/multiuser/simultaneous_typing_user2_spec.js
+++
b/cypress_test/integration_tests/multiuser/writer/simultaneous_typing_user2_spec.js
@@ -1,6 +1,6 @@
/* global describe it cy beforeEach require afterEach */
-var helper = require('../common/helper');
+var helper = require('../../common/helper');
describe('Simultaneous typing: user-2.', function() {
var testFileName = 'simultaneous_typing.odt';
@@ -9,7 +9,7 @@ describe('Simultaneous typing: user-2.', function() {
// Wait here, before loading the document.
// Opening two clients at the same time causes an issue.
cy.wait(5000);
- helper.beforeAll(testFileName, undefined, true);
+ helper.beforeAll(testFileName, 'writer', true);
});
afterEach(function() {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
