[Libreoffice-commits] online.git: cypress_test/integration_tests
Tamás Zolnai (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jul 31 17:06:50 UTC 2020
cypress_test/integration_tests/common/helper.js | 35 +++++++---
cypress_test/integration_tests/common/mobile_helper.js | 5 -
cypress_test/integration_tests/desktop/calc/bottom_bar_spec.js | 2
cypress_test/integration_tests/desktop/calc/focus_spec.js | 2
cypress_test/integration_tests/desktop/impress/slide_operations_spec.js | 2
cypress_test/integration_tests/desktop/writer/copy_paste_spec.js | 2
cypress_test/integration_tests/desktop/writer/form_field_spec.js | 2
cypress_test/integration_tests/desktop/writer/shape_operations_spec.js | 2
cypress_test/integration_tests/mobile/calc/alignment_options_spec.js | 2
cypress_test/integration_tests/mobile/calc/apply_font_spec.js | 2
cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js | 2
cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js | 2
cypress_test/integration_tests/mobile/calc/focus_spec.js | 2
cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js | 2
cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js | 2
cypress_test/integration_tests/mobile/calc/number_format_spec.js | 2
cypress_test/integration_tests/mobile/calc/spellchecking_spec.js | 2
cypress_test/integration_tests/mobile/impress/apply_font_shape_spec.js | 2
cypress_test/integration_tests/mobile/impress/apply_font_text_spec.js | 2
cypress_test/integration_tests/mobile/impress/apply_paragraph_props_shape_spec.js | 2
cypress_test/integration_tests/mobile/impress/apply_paragraph_props_text_spec.js | 2
cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js | 2
cypress_test/integration_tests/mobile/impress/impress_focus_spec.js | 2
cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js | 2
cypress_test/integration_tests/mobile/impress/slide_properties_spec.js | 2
cypress_test/integration_tests/mobile/impress/spellchecking_spec.js | 2
cypress_test/integration_tests/mobile/writer/apply_font_spec.js | 2
cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js | 2
cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js | 2
cypress_test/integration_tests/mobile/writer/focus_spec.js | 2
cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js | 2
cypress_test/integration_tests/mobile/writer/insert_field_spec.js | 2
cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js | 2
cypress_test/integration_tests/mobile/writer/insert_object_spec.js | 2
cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js | 2
cypress_test/integration_tests/mobile/writer/shape_properties_spec.js | 2
cypress_test/integration_tests/mobile/writer/spellchecking_spec.js | 2
cypress_test/integration_tests/mobile/writer/table_properties_spec.js | 2
cypress_test/integration_tests/mobile/writer/toolbar_spec.js | 2
cypress_test/integration_tests/multiuser/paragraph_prop_user1_spec.js | 2
cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js | 2
cypress_test/integration_tests/multiuser/sidebar_visibility_user1_spec.js | 2
cypress_test/integration_tests/multiuser/sidebar_visibility_user2_spec.js | 2
cypress_test/integration_tests/multiuser/simultaneous_typing_user1_spec.js | 2
cypress_test/integration_tests/multiuser/simultaneous_typing_user2_spec.js | 2
45 files changed, 70 insertions(+), 56 deletions(-)
New commits:
commit 210118a40a350b5085fb1ac23ab04f0a2f478cde
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Jul 31 15:44:39 2020 +0200
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Jul 31 19:06:31 2020 +0200
cypress: simplify beforeAll() methods.
We don't need an explicit parameter indicating the platform
type (e.g. mobile, desktop). We can check the userAgent to
get that information.
Change-Id: Ibbc041c4a389cff92203d245f55268ec4e93b0a0
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99889
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
diff --git a/cypress_test/integration_tests/common/helper.js b/cypress_test/integration_tests/common/helper.js
index a547eaf6a..7995e7bbb 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -2,11 +2,10 @@
require('cypress-wait-until');
-function loadTestDoc(fileName, subFolder, mobile) {
+function loadTestDoc(fileName, subFolder) {
cy.log('Loading test document - start.');
cy.log('Param - fileName: ' + fileName);
cy.log('Param - subFolder: ' + subFolder);
- cy.log('Param - mobile: ' + mobile);
// Get a clean test document
if (subFolder === undefined) {
@@ -23,9 +22,9 @@ function loadTestDoc(fileName, subFolder, mobile) {
});
}
- if (mobile === true) {
+ doIfOnMobile(function() {
cy.viewport('iphone-6');
- }
+ });
// Open test document
var URI;
@@ -157,9 +156,8 @@ function matchClipboardText(regexp) {
});
}
-function beforeAllDesktop(fileName, subFolder) {
- var mobile = false;
- loadTestDoc(fileName, subFolder, mobile);
+function beforeAll(fileName, subFolder) {
+ loadTestDoc(fileName, subFolder);
}
function afterAll(fileName) {
@@ -392,6 +390,25 @@ function inputOnIdle(selector, input, waitingTime = 1000) {
cy.log('Type into an input item when idle - end.');
}
+function doIfOnMobile(callback) {
+ cy.window()
+ .then(function(win) {
+ if (win.navigator.userAgent === 'cypress-mobile') {
+ callback();
+ }
+ });
+}
+
+function doIfOnDesktop(callback) {
+ cy.window()
+ .then(function(win) {
+ if (win.navigator.userAgent === 'cypress') {
+ callback();
+ }
+ });
+}
+
+
module.exports.loadTestDoc = loadTestDoc;
module.exports.assertCursorAndFocus = assertCursorAndFocus;
module.exports.assertNoKeyboardInput = assertNoKeyboardInput;
@@ -406,10 +423,12 @@ module.exports.initAliasToEmptyString = initAliasToEmptyString;
module.exports.doIfInCalc = doIfInCalc;
module.exports.doIfInImpress = doIfInImpress;
module.exports.doIfInWriter = doIfInWriter;
-module.exports.beforeAllDesktop = beforeAllDesktop;
+module.exports.beforeAll = beforeAll;
module.exports.typeText = typeText;
module.exports.getLOVersion = getLOVersion;
module.exports.imageShouldBeFullWhiteOrNot = imageShouldBeFullWhiteOrNot;
module.exports.clickOnIdle = clickOnIdle;
module.exports.inputOnIdle = inputOnIdle;
module.exports.waitUntilIdle = waitUntilIdle;
+module.exports.doIfOnMobile = doIfOnMobile;
+module.exports.doIfOnDesktop = doIfOnDesktop;
diff --git a/cypress_test/integration_tests/common/mobile_helper.js b/cypress_test/integration_tests/common/mobile_helper.js
index b14113d02..8aaa1f8af 100644
--- a/cypress_test/integration_tests/common/mobile_helper.js
+++ b/cypress_test/integration_tests/common/mobile_helper.js
@@ -29,10 +29,6 @@ function enableEditingMobile() {
cy.log('Enabling editing mode - end.');
}
-function beforeAllMobile(fileName, subFolder) {
- helper.loadTestDoc(fileName, subFolder, true);
-}
-
function longPressOnDocument(posX, posY) {
cy.log('Emulating a long press - start.');
cy.log('Param - posX: ' + posX);
@@ -208,7 +204,6 @@ function selectFromColorPalette(paletteNum, groupNum, colorNum) {
}
module.exports.enableEditingMobile = enableEditingMobile;
-module.exports.beforeAllMobile = beforeAllMobile;
module.exports.longPressOnDocument = longPressOnDocument;
module.exports.openHamburgerMenu = openHamburgerMenu;
module.exports.closeHamburgerMenu = closeHamburgerMenu;
diff --git a/cypress_test/integration_tests/desktop/calc/bottom_bar_spec.js b/cypress_test/integration_tests/desktop/calc/bottom_bar_spec.js
index bab9413fb..3c0c31c02 100644
--- a/cypress_test/integration_tests/desktop/calc/bottom_bar_spec.js
+++ b/cypress_test/integration_tests/desktop/calc/bottom_bar_spec.js
@@ -7,7 +7,7 @@ describe('Calc bottom bar tests.', function() {
var testFileName = 'BottomBar.ods';
beforeEach(function() {
- helper.beforeAllDesktop(testFileName, 'calc');
+ helper.beforeAll(testFileName, 'calc');
// Wait until the Formula-Bar is loaded.
cy.get('.inputbar_container', {timeout : 10000});
});
diff --git a/cypress_test/integration_tests/desktop/calc/focus_spec.js b/cypress_test/integration_tests/desktop/calc/focus_spec.js
index 7e27890b7..568e1fd11 100644
--- a/cypress_test/integration_tests/desktop/calc/focus_spec.js
+++ b/cypress_test/integration_tests/desktop/calc/focus_spec.js
@@ -7,7 +7,7 @@ describe('Calc focus tests', function() {
var testFileName = 'focus.ods';
beforeEach(function() {
- helper.beforeAllDesktop(testFileName, 'calc');
+ helper.beforeAll(testFileName, 'calc');
// Wait until the Formula-Bar is loaded.
cy.get('.inputbar_container', {timeout : 10000});
diff --git a/cypress_test/integration_tests/desktop/impress/slide_operations_spec.js b/cypress_test/integration_tests/desktop/impress/slide_operations_spec.js
index 3541c577a..3d0346800 100644
--- a/cypress_test/integration_tests/desktop/impress/slide_operations_spec.js
+++ b/cypress_test/integration_tests/desktop/impress/slide_operations_spec.js
@@ -7,7 +7,7 @@ describe('Slide operations', function() {
var testFileName = 'slide_operations.odp';
beforeEach(function() {
- helper.loadTestDoc(testFileName, 'impress');
+ helper.beforeAll(testFileName, 'impress');
});
afterEach(function() {
diff --git a/cypress_test/integration_tests/desktop/writer/copy_paste_spec.js b/cypress_test/integration_tests/desktop/writer/copy_paste_spec.js
index dddbd395e..5883d235b 100644
--- a/cypress_test/integration_tests/desktop/writer/copy_paste_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/copy_paste_spec.js
@@ -6,7 +6,7 @@ describe('Clipboard operations.', function() {
var testFileName = 'copy_paste.odt';
beforeEach(function() {
- helper.loadTestDoc(testFileName, 'writer');
+ helper.beforeAll(testFileName, 'writer');
});
afterEach(function() {
diff --git a/cypress_test/integration_tests/desktop/writer/form_field_spec.js b/cypress_test/integration_tests/desktop/writer/form_field_spec.js
index 4c37068f9..1b866126a 100644
--- a/cypress_test/integration_tests/desktop/writer/form_field_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/form_field_spec.js
@@ -7,7 +7,7 @@ describe('Form field button tests.', function() {
function before(fileName) {
testFileName = fileName;
- helper.loadTestDoc(fileName, 'writer');
+ helper.beforeAll(fileName, 'writer');
// Wait for the sidebar to change the zoom level by load
cy.get('#tb_actionbar_item_zoom .w2ui-tb-caption')
diff --git a/cypress_test/integration_tests/desktop/writer/shape_operations_spec.js b/cypress_test/integration_tests/desktop/writer/shape_operations_spec.js
index 0d3ab3d92..990278b7d 100644
--- a/cypress_test/integration_tests/desktop/writer/shape_operations_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/shape_operations_spec.js
@@ -10,7 +10,7 @@ describe('Shape operations', function() {
});
it('Insert a simple shape.', function() {
- helper.loadTestDoc(testFileName, 'writer');
+ helper.beforeAll(testFileName, 'writer');
// Scroll on the up toolbar
cy.get('#toolbar-up .w2ui-scroll-right').click();
diff --git a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
index 344ef8a36..3d7343485 100644
--- a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
@@ -9,7 +9,7 @@ describe('Change alignment settings.', function() {
var testFileName = 'alignment_options.ods';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'calc');
+ helper.beforeAll(testFileName, 'calc');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/calc/apply_font_spec.js b/cypress_test/integration_tests/mobile/calc/apply_font_spec.js
index 3f717edb3..3dca28d9c 100644
--- a/cypress_test/integration_tests/mobile/calc/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/apply_font_spec.js
@@ -9,7 +9,7 @@ describe('Apply font changes.', function() {
var testFileName = 'apply_font.ods';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'calc');
+ helper.beforeAll(testFileName, 'calc');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js b/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js
index 68a4ae835..e2dfe5f8f 100644
--- a/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js
@@ -10,7 +10,7 @@ describe('Interact with bottom toolbar.', function() {
function before(fileName) {
testFileName = fileName;
- mobileHelper.beforeAllMobile(testFileName, 'calc');
+ helper.beforeAll(testFileName, 'calc');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js b/cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js
index b28013450..29f3bf608 100644
--- a/cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js
@@ -9,7 +9,7 @@ describe('Change cell appearance.', function() {
var testFileName = 'cell_appearance.ods';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'calc');
+ helper.beforeAll(testFileName, 'calc');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/calc/focus_spec.js b/cypress_test/integration_tests/mobile/calc/focus_spec.js
index 8eacfc60a..d12385daf 100644
--- a/cypress_test/integration_tests/mobile/calc/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/focus_spec.js
@@ -8,7 +8,7 @@ describe('Calc focus tests', function() {
var testFileName = 'focus.ods';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'calc');
+ helper.beforeAll(testFileName, 'calc');
// Wait until the Formula-Bar is loaded.
cy.get('.inputbar_container', {timeout : 10000});
diff --git a/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js b/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
index f71983264..298d520d7 100644
--- a/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
@@ -10,7 +10,7 @@ describe('Trigger hamburger menu options.', function() {
function before(testFile) {
testFileName = testFile;
- mobileHelper.beforeAllMobile(testFileName, 'calc');
+ helper.beforeAll(testFileName, 'calc');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js b/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
index 04ec7cf6a..55c8d7afe 100644
--- a/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
@@ -11,7 +11,7 @@ describe('Calc insertion wizard.', function() {
var testFileName = 'insertion_wizard.ods';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'calc');
+ helper.beforeAll(testFileName, 'calc');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/calc/number_format_spec.js b/cypress_test/integration_tests/mobile/calc/number_format_spec.js
index ade1dea40..ef965daee 100644
--- a/cypress_test/integration_tests/mobile/calc/number_format_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/number_format_spec.js
@@ -9,7 +9,7 @@ describe('Apply number formatting.', function() {
var testFileName = 'number_format.ods';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'calc');
+ helper.beforeAll(testFileName, 'calc');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js b/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js
index 79ed12d33..7edff4719 100644
--- a/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js
@@ -9,7 +9,7 @@ describe('Calc spell checking menu.', function() {
var testFileName = 'spellchecking.ods';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'calc');
+ helper.beforeAll(testFileName, 'calc');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/impress/apply_font_shape_spec.js b/cypress_test/integration_tests/mobile/impress/apply_font_shape_spec.js
index 1b5eec638..f75166055 100644
--- a/cypress_test/integration_tests/mobile/impress/apply_font_shape_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/apply_font_shape_spec.js
@@ -8,7 +8,7 @@ describe('Apply font on selected shape.', function() {
var testFileName = 'apply_font_shape.odp';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'impress');
+ helper.beforeAll(testFileName, 'impress');
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/impress/apply_font_text_spec.js b/cypress_test/integration_tests/mobile/impress/apply_font_text_spec.js
index 55e4fd469..ad667d6df 100644
--- a/cypress_test/integration_tests/mobile/impress/apply_font_text_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/apply_font_text_spec.js
@@ -8,7 +8,7 @@ describe('Apply font on selected text.', function() {
var testFileName = 'apply_font_text.odp';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'impress');
+ helper.beforeAll(testFileName, 'impress');
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_shape_spec.js b/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_shape_spec.js
index e3e5fb479..7c45c06b1 100644
--- a/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_shape_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_shape_spec.js
@@ -8,7 +8,7 @@ describe('Apply paragraph properties on selected shape.', function() {
var testFileName = 'apply_paragraph_props_shape.odp';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'impress');
+ helper.beforeAll(testFileName, 'impress');
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_text_spec.js b/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_text_spec.js
index 30cad4134..07ab246ec 100644
--- a/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_text_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_text_spec.js
@@ -8,7 +8,7 @@ describe('Apply paragraph properties on selected text.', function() {
var testFileName = 'apply_paragraph_props_text.odp';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'impress');
+ helper.beforeAll(testFileName, 'impress');
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js b/cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js
index 3b7a31086..6631ca0bb 100644
--- a/cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js
@@ -10,7 +10,7 @@ describe('Trigger hamburger menu options.', function() {
function before(testFile) {
testFileName = testFile;
- mobileHelper.beforeAllMobile(testFileName, 'impress');
+ helper.beforeAll(testFileName, 'impress');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js b/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
index 5d03f535e..ed7cab2ac 100644
--- a/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
@@ -8,7 +8,7 @@ describe('Impress focus tests', function() {
var testFileName = 'focus.odp';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'impress');
+ helper.beforeAll(testFileName, 'impress');
});
afterEach(function() {
diff --git a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
index ae3a928d9..a1b7aacad 100644
--- a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
@@ -10,7 +10,7 @@ describe('Impress insertion wizard.', function() {
var testFileName = 'insertion_wizard.odp';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'impress');
+ helper.beforeAll(testFileName, 'impress');
mobileHelper.enableEditingMobile();
});
diff --git a/cypress_test/integration_tests/mobile/impress/slide_properties_spec.js b/cypress_test/integration_tests/mobile/impress/slide_properties_spec.js
index a9ab41bb0..c1fdbbfc3 100644
--- a/cypress_test/integration_tests/mobile/impress/slide_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/slide_properties_spec.js
@@ -7,7 +7,7 @@ describe('Changing slide properties.', function() {
var testFileName = 'slide_properties.odp';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'impress');
+ helper.beforeAll(testFileName, 'impress');
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/impress/spellchecking_spec.js b/cypress_test/integration_tests/mobile/impress/spellchecking_spec.js
index 808f0a879..65f9a92be 100644
--- a/cypress_test/integration_tests/mobile/impress/spellchecking_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/spellchecking_spec.js
@@ -7,7 +7,7 @@ describe('Spell checking menu.', function() {
var testFileName = 'spellchecking.odp';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'impress');
+ helper.beforeAll(testFileName, 'impress');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/writer/apply_font_spec.js b/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
index 1d5473970..de29e6ab8 100644
--- a/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
@@ -8,7 +8,7 @@ describe('Apply font changes.', function() {
var testFileName = 'apply_font.odt';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'writer');
+ helper.beforeAll(testFileName, 'writer');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
index ff24e5b0c..f3b86a638 100644
--- a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
@@ -8,7 +8,7 @@ describe('Apply paragraph properties.', function() {
var testFileName = 'apply_paragraph_properties.odt';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'writer');
+ helper.beforeAll(testFileName, 'writer');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js b/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js
index a866f1d68..fbfe80aed 100644
--- a/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js
@@ -8,7 +8,7 @@ describe('Pushing bottom toolbar items.', function() {
var testFileName = 'bottom_toolbar.odt';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'writer');
+ helper.beforeAll(testFileName, 'writer');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/writer/focus_spec.js b/cypress_test/integration_tests/mobile/writer/focus_spec.js
index 6e4b4055d..7fc8c9181 100644
--- a/cypress_test/integration_tests/mobile/writer/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/focus_spec.js
@@ -7,7 +7,7 @@ describe('Focus tests', function() {
var testFileName = 'focus.odt';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'writer');
+ helper.beforeAll(testFileName, 'writer');
});
afterEach(function() {
diff --git a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js b/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
index 34201de9f..160b6668f 100644
--- a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
@@ -8,7 +8,7 @@ describe('Trigger hamburger menu options.', function() {
var testFileName = 'hamburger_menu.odt';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'writer');
+ helper.beforeAll(testFileName, 'writer');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
index 41147dd3b..8a8847451 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
@@ -8,7 +8,7 @@ describe('Insert fields via insertion wizard.', function() {
var testFileName = 'insert_field.odt';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'writer');
+ helper.beforeAll(testFileName, 'writer');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js b/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
index 045bf3502..e4c314ddc 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
@@ -8,7 +8,7 @@ describe('Insert formatting mark via insertion wizard.', function() {
var testFileName = 'insert_formatting_mark.odt';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'writer');
+ helper.beforeAll(testFileName, 'writer');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
index e9daa39ee..988d6174c 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
@@ -10,7 +10,7 @@ describe('Insert objects via insertion wizard.', function() {
var testFileName = 'insert_object.odt';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'writer');
+ helper.beforeAll(testFileName, 'writer');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js b/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js
index cb39c453a..179324a23 100644
--- a/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js
@@ -7,7 +7,7 @@ describe('Mobile wizard state tests', function() {
var testFileName = 'mobile_wizard_state.odt';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'writer');
+ helper.beforeAll(testFileName, 'writer');
});
afterEach(function() {
diff --git a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
index 01dcd3c71..3497191e4 100644
--- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
@@ -9,7 +9,7 @@ describe('Change shape properties via mobile wizard.', function() {
var testFileName = 'shape_properties.odt';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'writer');
+ helper.beforeAll(testFileName, 'writer');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
index 674b14d94..0534824f4 100644
--- a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
@@ -8,7 +8,7 @@ describe('Spell checking menu.', function() {
var testFileName = 'spellchecking.odt';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'writer');
+ helper.beforeAll(testFileName, 'writer');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/writer/table_properties_spec.js b/cypress_test/integration_tests/mobile/writer/table_properties_spec.js
index 1c82c323e..f789f0d4c 100644
--- a/cypress_test/integration_tests/mobile/writer/table_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/table_properties_spec.js
@@ -9,7 +9,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
function before(testFile) {
testFileName = testFile;
- helper.loadTestDoc(testFileName, 'writer', true);
+ helper.beforeAll(testFileName, 'writer');
// Click on edit button
mobileHelper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/writer/toolbar_spec.js b/cypress_test/integration_tests/mobile/writer/toolbar_spec.js
index c4209452c..8c34016ab 100644
--- a/cypress_test/integration_tests/mobile/writer/toolbar_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/toolbar_spec.js
@@ -7,7 +7,7 @@ describe('Toolbar tests', function() {
var testFileName = 'toolbar.odt';
beforeEach(function() {
- mobileHelper.beforeAllMobile(testFileName, 'writer');
+ helper.beforeAll(testFileName, 'writer');
});
afterEach(function() {
diff --git a/cypress_test/integration_tests/multiuser/paragraph_prop_user1_spec.js b/cypress_test/integration_tests/multiuser/paragraph_prop_user1_spec.js
index c435af0a4..225af99d1 100644
--- a/cypress_test/integration_tests/multiuser/paragraph_prop_user1_spec.js
+++ b/cypress_test/integration_tests/multiuser/paragraph_prop_user1_spec.js
@@ -6,7 +6,7 @@ describe('Change paragraph properties: user-1.', function() {
var testFileName = 'paragraph_prop.odt';
beforeEach(function() {
- helper.beforeAllDesktop(testFileName);
+ helper.beforeAll(testFileName);
});
afterEach(function() {
diff --git a/cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js b/cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js
index 288707351..05cf43b65 100644
--- a/cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js
+++ b/cypress_test/integration_tests/multiuser/paragraph_prop_user2_spec.js
@@ -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.beforeAllDesktop(testFileName);
+ helper.beforeAll(testFileName);
});
afterEach(function() {
diff --git a/cypress_test/integration_tests/multiuser/sidebar_visibility_user1_spec.js b/cypress_test/integration_tests/multiuser/sidebar_visibility_user1_spec.js
index c0c1272bb..3d252a0da 100644
--- a/cypress_test/integration_tests/multiuser/sidebar_visibility_user1_spec.js
+++ b/cypress_test/integration_tests/multiuser/sidebar_visibility_user1_spec.js
@@ -7,7 +7,7 @@ describe('Sidebar visibility: user-1.', function() {
var testFileName = 'sidebar_visibility.odt';
beforeEach(function() {
- helper.beforeAllDesktop(testFileName);
+ helper.beforeAll(testFileName);
});
afterEach(function() {
diff --git a/cypress_test/integration_tests/multiuser/sidebar_visibility_user2_spec.js b/cypress_test/integration_tests/multiuser/sidebar_visibility_user2_spec.js
index d98608769..ea07c0abe 100644
--- a/cypress_test/integration_tests/multiuser/sidebar_visibility_user2_spec.js
+++ b/cypress_test/integration_tests/multiuser/sidebar_visibility_user2_spec.js
@@ -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.beforeAllDesktop(testFileName);
+ helper.beforeAll(testFileName);
});
afterEach(function() {
diff --git a/cypress_test/integration_tests/multiuser/simultaneous_typing_user1_spec.js b/cypress_test/integration_tests/multiuser/simultaneous_typing_user1_spec.js
index 293617bf5..e36c79bd1 100644
--- a/cypress_test/integration_tests/multiuser/simultaneous_typing_user1_spec.js
+++ b/cypress_test/integration_tests/multiuser/simultaneous_typing_user1_spec.js
@@ -6,7 +6,7 @@ describe('Simultaneous typing: user-1.', function() {
var testFileName = 'simultaneous_typing.odt';
beforeEach(function() {
- helper.beforeAllDesktop(testFileName);
+ helper.beforeAll(testFileName);
});
afterEach(function() {
diff --git a/cypress_test/integration_tests/multiuser/simultaneous_typing_user2_spec.js b/cypress_test/integration_tests/multiuser/simultaneous_typing_user2_spec.js
index dc4873d56..cc23f9f46 100644
--- a/cypress_test/integration_tests/multiuser/simultaneous_typing_user2_spec.js
+++ b/cypress_test/integration_tests/multiuser/simultaneous_typing_user2_spec.js
@@ -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.beforeAllDesktop(testFileName);
+ helper.beforeAll(testFileName);
});
afterEach(function() {
More information about the Libreoffice-commits
mailing list