diff options
author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2020-08-07 14:59:09 +0200 |
---|---|---|
committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2020-08-07 15:37:14 +0200 |
commit | 9c312a4cc66ff6687a7b761341ac75de04abccda (patch) | |
tree | 9e65dd0c64002bd42a3ebc7354a81e5b7b1285bd /cypress_test/integration_tests/multiuser | |
parent | android: Show the real core git hash in the About dialog. (diff) | |
download | online-9c312a4cc66ff6687a7b761341ac75de04abccda.tar.gz online-9c312a4cc66ff6687a7b761341ac75de04abccda.zip |
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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'cypress_test/integration_tests/multiuser')
-rw-r--r-- | cypress_test/integration_tests/multiuser/calc/sheet_operations_user1_spec.js (renamed from cypress_test/integration_tests/multiuser/sheet_operations_user1_spec.js) | 4 | ||||
-rw-r--r-- | cypress_test/integration_tests/multiuser/calc/sheet_operations_user2_spec.js (renamed from cypress_test/integration_tests/multiuser/sheet_operations_user2_spec.js) | 4 | ||||
-rw-r--r-- | cypress_test/integration_tests/multiuser/impress/slide_operations_user1_spec.js (renamed from cypress_test/integration_tests/multiuser/slide_operations_user1_spec.js) | 6 | ||||
-rw-r--r-- | cypress_test/integration_tests/multiuser/impress/slide_operations_user2_spec.js (renamed from cypress_test/integration_tests/multiuser/slide_operations_user2_spec.js) | 6 | ||||
-rw-r--r-- | cypress_test/integration_tests/multiuser/writer/paragraph_prop_user1_spec.js (renamed from cypress_test/integration_tests/multiuser/paragraph_prop_user1_spec.js) | 4 | ||||
-rw-r--r-- | cypress_test/integration_tests/multiuser/writer/paragraph_prop_user2_spec.js (renamed from cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js) | 4 | ||||
-rw-r--r-- | cypress_test/integration_tests/multiuser/writer/sidebar_visibility_user1_spec.js (renamed from cypress_test/integration_tests/multiuser/sidebar_visibility_user1_spec.js) | 6 | ||||
-rw-r--r-- | cypress_test/integration_tests/multiuser/writer/sidebar_visibility_user2_spec.js (renamed from cypress_test/integration_tests/multiuser/sidebar_visibility_user2_spec.js) | 4 | ||||
-rw-r--r-- | cypress_test/integration_tests/multiuser/writer/simultaneous_typing_user1_spec.js (renamed from cypress_test/integration_tests/multiuser/simultaneous_typing_user1_spec.js) | 4 | ||||
-rw-r--r-- | cypress_test/integration_tests/multiuser/writer/simultaneous_typing_user2_spec.js (renamed from cypress_test/integration_tests/multiuser/simultaneous_typing_user2_spec.js) | 4 |
10 files changed, 23 insertions, 23 deletions
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 index c78f839fa6..5773e2926e 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 index 266a349656..6cc9cf8cb0 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 index 640102cd68..4903b9f2d9 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 index 476d261964..4f8124bd56 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 index 225af99d19..c92b943719 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 index 0f2b05198f..4dce2446a0 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 index 3d252a0daa..75dda63432 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 index 37c6b6e66a..926f98adad 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 index a4c2388544..517b98b483 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 index 4733949efe..d8cc961c7a 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() { |