[Libreoffice-commits] online.git: cypress_test/integration_tests

Tamás Zolnai (via logerrit) logerrit at kemper.freedesktop.org
Mon Jun 1 18:43:26 UTC 2020


 cypress_test/integration_tests/desktop/calc/focus_spec.js                       |   18 ++--
 cypress_test/integration_tests/mobile/calc/alignment_options_spec.js            |   34 +++----
 cypress_test/integration_tests/mobile/calc/apply_font_spec.js                   |   26 ++---
 cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js               |   42 ++++-----
 cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js              |   38 ++++----
 cypress_test/integration_tests/mobile/calc/focus_spec.js                        |   24 ++---
 cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js             |   12 +-
 cypress_test/integration_tests/mobile/calc/number_format_spec.js                |   40 ++++-----
 cypress_test/integration_tests/mobile/calc/spellchecking_spec.js                |   12 +-
 cypress_test/integration_tests/mobile/impress/impress_focus_spec.js             |   26 ++---
 cypress_test/integration_tests/mobile/writer/apply_font_spec.js                 |   36 ++++----
 cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js |   44 +++++-----
 cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js             |   32 +++----
 cypress_test/integration_tests/mobile/writer/insert_field_spec.js               |   16 +--
 cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js     |   16 +--
 cypress_test/integration_tests/mobile/writer/insert_object_spec.js              |    8 -
 cypress_test/integration_tests/mobile/writer/shape_properties_spec.js           |    4 
 cypress_test/integration_tests/mobile/writer/spellchecking_spec.js              |    6 -
 cypress_test/integration_tests/mobile/writer/table_properties_spec.js           |   36 ++++----
 19 files changed, 235 insertions(+), 235 deletions(-)

New commits:
commit 76e45490a4a71d63d639c63f5bdddee271a6d9bd
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Jun 1 14:24:14 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon Jun 1 20:43:06 2020 +0200

    cypress: consistent naming of helper files.
    
    Change-Id: I245dc0ee49684751f9042ff25e190dd883bca536
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95284
    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/calc.js b/cypress_test/integration_tests/common/calc_helper.js
similarity index 100%
rename from cypress_test/integration_tests/common/calc.js
rename to cypress_test/integration_tests/common/calc_helper.js
diff --git a/cypress_test/integration_tests/common/impress.js b/cypress_test/integration_tests/common/impress_helper.js
similarity index 100%
rename from cypress_test/integration_tests/common/impress.js
rename to cypress_test/integration_tests/common/impress_helper.js
diff --git a/cypress_test/integration_tests/desktop/calc/focus_spec.js b/cypress_test/integration_tests/desktop/calc/focus_spec.js
index 649d2ceb9..0c1da24c5 100644
--- a/cypress_test/integration_tests/desktop/calc/focus_spec.js
+++ b/cypress_test/integration_tests/desktop/calc/focus_spec.js
@@ -1,7 +1,7 @@
 /* global describe it cy beforeEach require afterEach */
 
 var helper = require('../../common/helper');
-var calc = require('../../common/calc');
+var calcHelper = require('../../common/calc_helper');
 
 describe('Calc focus tests', function() {
 	var testFileName = 'focus.ods';
@@ -21,10 +21,10 @@ describe('Calc focus tests', function() {
 
 		// Select the first cell to edit the same one.
 		// Use the tile's edge to find the first cell's position
-		calc.clickOnFirstCell();
+		calcHelper.clickOnFirstCell();
 
 		// Click in the formula-bar.
-		calc.clickFormulaBar();
+		calcHelper.clickFormulaBar();
 		helper.assertCursorAndFocus();
 
 		// Type some text.
@@ -33,8 +33,8 @@ describe('Calc focus tests', function() {
 		cy.get('textarea.clipboard').type('{enter}');
 
 		// Select the first cell to edit the same one.
-		calc.clickOnFirstCell();
-		calc.clickFormulaBar();
+		calcHelper.clickOnFirstCell();
+		calcHelper.clickFormulaBar();
 		helper.assertCursorAndFocus();
 		// Validate.
 		cy.get('textarea.clipboard').type('{ctrl}a');
@@ -44,8 +44,8 @@ describe('Calc focus tests', function() {
 
 		// Type some more text, at the end.
 		cy.log('Appending text at the end.');
-		calc.clickOnFirstCell();
-		calc.clickFormulaBar();
+		calcHelper.clickOnFirstCell();
+		calcHelper.clickFormulaBar();
 		helper.assertCursorAndFocus();
 		var text2 = ', this is a test.';
 		helper.typeText('textarea.clipboard', text2);
@@ -57,8 +57,8 @@ describe('Calc focus tests', function() {
 
 		// Type some more text, in the middle.
 		cy.log('Inserting text in the middle.');
-		calc.clickOnFirstCell();
-		calc.clickFormulaBar();
+		calcHelper.clickOnFirstCell();
+		calcHelper.clickFormulaBar();
 		helper.assertCursorAndFocus();
 		var text3 = ' BAZINGA';
 		helper.typeText('textarea.clipboard', text3);
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 649dcb672..93ac85162 100644
--- a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
@@ -1,9 +1,9 @@
 /* global describe it cy beforeEach require afterEach expect*/
 
 var helper = require('../../common/helper');
-var calc = require('../../common/calc');
+var calcHelper = require('../../common/calc_helper');
 var mobileHelper = require('../../common/mobile_helper');
-var calcHelper = require('./calc_helper');
+var calcMobileHelper = require('./calc_mobile_helper');
 
 describe('Change alignment settings.', function() {
 	var testFileName = 'alignment_options.ods';
@@ -20,7 +20,7 @@ describe('Change alignment settings.', function() {
 	});
 
 	function getTextPosForFirstCell() {
-		calc.dblClickOnFirstCell();
+		calcHelper.dblClickOnFirstCell();
 
 		// Select text content
 		cy.get('textarea.clipboard')
@@ -36,11 +36,11 @@ describe('Change alignment settings.', function() {
 		cy.get('@currentTextPos')
 			.should('be.greaterThan', 0);
 
-		calcHelper.removeTextSelection();
+		calcMobileHelper.removeTextSelection();
 	}
 
 	function openAlignmentPaneForFirstCell() {
-		calc.clickOnFirstCell();
+		calcHelper.clickOnFirstCell();
 
 		mobileHelper.openMobileWizard();
 
@@ -58,13 +58,13 @@ describe('Change alignment settings.', function() {
 		cy.get('#AlignRight')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'align', 'right');
 
 		// Change alignment back
-		calc.clickOnFirstCell();
+		calcHelper.clickOnFirstCell();
 
 		mobileHelper.openMobileWizard();
 
@@ -74,7 +74,7 @@ describe('Change alignment settings.', function() {
 		cy.get('#AlignLeft')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'align', 'left');
@@ -86,7 +86,7 @@ describe('Change alignment settings.', function() {
 		cy.get('#AlignHorizontalCenter')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'align', 'center');
@@ -98,7 +98,7 @@ describe('Change alignment settings.', function() {
 		cy.get('#AlignBlock')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'align', 'justify');
@@ -127,13 +127,13 @@ describe('Change alignment settings.', function() {
 		cy.get('#AlignTop')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'valign', 'top');
 
 		// Change alignment back
-		calc.clickOnFirstCell();
+		calcHelper.clickOnFirstCell();
 
 		mobileHelper.openMobileWizard();
 
@@ -143,7 +143,7 @@ describe('Change alignment settings.', function() {
 		cy.get('#AlignBottom')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'valign', 'bottom');
@@ -155,7 +155,7 @@ describe('Change alignment settings.', function() {
 		cy.get('#AlignVCenter')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'valign', 'middle');
@@ -243,7 +243,7 @@ describe('Change alignment settings.', function() {
 		cy.get('#IncrementIndent')
 			.click();
 
-		calcHelper.removeTextSelection();
+		calcMobileHelper.removeTextSelection();
 
 		openAlignmentPaneForFirstCell();
 
@@ -326,7 +326,7 @@ describe('Change alignment settings.', function() {
 
 	it('Merge cells.', function() {
 		// Select the full row
-		calcHelper.selectFirstRow();
+		calcMobileHelper.selectFirstRow();
 
 		// Even after we get the cell row selection the merge cell options is still disabled
 		// So we open mobile wizard again and again until merge cells get the right state
@@ -360,7 +360,7 @@ describe('Change alignment settings.', function() {
 			.should('have.prop', 'checked', true);
 
 		// Check content
-		calcHelper.selectAllMobile(false);
+		calcMobileHelper.selectAllMobile(false);
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'colspan', '1024');
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 ac5f30545..c55802c81 100644
--- a/cypress_test/integration_tests/mobile/calc/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/apply_font_spec.js
@@ -1,9 +1,9 @@
 /* global describe it cy beforeEach require afterEach Cypress*/
 
 var helper = require('../../common/helper');
-var calc = require('../../common/calc');
+var calcHelper = require('../../common/calc_helper');
 var mobileHelper = require('../../common/mobile_helper');
-var calcHelper = require('./calc_helper');
+var calcMobileHelper = require('./calc_mobile_helper');
 
 describe('Apply font changes.', function() {
 	var testFileName = 'apply_font.ods';
@@ -14,7 +14,7 @@ describe('Apply font changes.', function() {
 		// Click on edit button
 		mobileHelper.enableEditingMobile();
 
-		calc.clickOnFirstCell();
+		calcHelper.clickOnFirstCell();
 
 		cy.get('.leaflet-marker-icon')
 			.should('be.visible');
@@ -38,7 +38,7 @@ describe('Apply font changes.', function() {
 		cy.get('#Bold')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td b')
 			.should('exist');
@@ -48,7 +48,7 @@ describe('Apply font changes.', function() {
 		cy.get('#Italic')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td i')
 			.should('exist');
@@ -58,7 +58,7 @@ describe('Apply font changes.', function() {
 		cy.get('#Underline')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td u')
 			.should('exist');
@@ -68,7 +68,7 @@ describe('Apply font changes.', function() {
 		cy.get('#Strikeout')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td s')
 			.should('exist');
@@ -78,7 +78,7 @@ describe('Apply font changes.', function() {
 		cy.get('#Shadowed')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		// TODO: Shadowed is not in the clipboard content.
 	});
@@ -101,7 +101,7 @@ describe('Apply font changes.', function() {
 		cy.get('#fontnamecombobox .ui-header-right .entry-value')
 			.should('have.text', 'Linux Libertine G');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td font')
 			.should('have.attr', 'face', 'Linux Libertine G');
@@ -129,7 +129,7 @@ describe('Apply font changes.', function() {
 		cy.get('#fontsizecombobox .ui-header-right .entry-value')
 			.should('have.text', '14');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td font')
 			.should('have.attr', 'size', '4');
@@ -140,7 +140,7 @@ describe('Apply font changes.', function() {
 		cy.get('#Grow')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td font')
 			.should('have.attr', 'size', '3');
@@ -151,7 +151,7 @@ describe('Apply font changes.', function() {
 		cy.get('#Shrink')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td font')
 			.should('have.attr', 'size', '1');
@@ -164,7 +164,7 @@ describe('Apply font changes.', function() {
 
 		mobileHelper.selectFromColorPalette(0, 5);
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td font')
 			.should('have.attr', 'color', '#00FF00');
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 7005e18d5..d1c2a02a6 100644
--- a/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js
@@ -1,9 +1,9 @@
 /* global describe it cy require expect afterEach */
 
 var helper = require('../../common/helper');
-var calc = require('../../common/calc');
+var calcHelper = require('../../common/calc_helper');
 var mobileHelper = require('../../common/mobile_helper');
-var calcHelper = require('./calc_helper');
+var calcMobileHelper = require('./calc_mobile_helper');
 
 describe('Interact with bottom toolbar.', function() {
 	var testFileName;
@@ -15,7 +15,7 @@ describe('Interact with bottom toolbar.', function() {
 		// Click on edit button
 		mobileHelper.enableEditingMobile();
 
-		calc.clickOnFirstCell();
+		calcHelper.clickOnFirstCell();
 	}
 
 	afterEach(function() {
@@ -23,7 +23,7 @@ describe('Interact with bottom toolbar.', function() {
 	});
 
 	function getTextPosForFirstCell() {
-		calc.dblClickOnFirstCell();
+		calcHelper.dblClickOnFirstCell();
 
 		// Select text content
 		cy.get('textarea.clipboard')
@@ -39,7 +39,7 @@ describe('Interact with bottom toolbar.', function() {
 		cy.get('@currentTextPos')
 			.should('be.greaterThan', 0);
 
-		calcHelper.removeTextSelection();
+		calcMobileHelper.removeTextSelection();
 	}
 
 	it('Apply bold.', function() {
@@ -48,7 +48,7 @@ describe('Interact with bottom toolbar.', function() {
 		cy.get('.w2ui-tb-image.w2ui-icon.bold')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td b')
 			.should('exist');
@@ -60,7 +60,7 @@ describe('Interact with bottom toolbar.', function() {
 		cy.get('.w2ui-tb-image.w2ui-icon.italic')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td i')
 			.should('exist');
@@ -72,7 +72,7 @@ describe('Interact with bottom toolbar.', function() {
 		cy.get('.w2ui-tb-image.w2ui-icon.underline')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td u')
 			.should('exist');
@@ -84,7 +84,7 @@ describe('Interact with bottom toolbar.', function() {
 		cy.get('.w2ui-tb-image.w2ui-icon.strikeout')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td s')
 			.should('exist');
@@ -98,7 +98,7 @@ describe('Interact with bottom toolbar.', function() {
 
 		mobileHelper.selectFromColorPalette(0, 5);
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td font')
 			.should('have.attr', 'color', '#00FF00');
@@ -112,7 +112,7 @@ describe('Interact with bottom toolbar.', function() {
 
 		mobileHelper.selectFromColorPalette(0, 5);
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'bgcolor', '#00FF00');
@@ -122,12 +122,12 @@ describe('Interact with bottom toolbar.', function() {
 		before('bottom_toolbar.ods');
 
 		// Select the full row
-		calcHelper.selectFirstRow();
+		calcMobileHelper.selectFirstRow();
 
 		cy.get('.w2ui-tb-image.w2ui-icon.togglemergecells')
 			.click();
 
-		calcHelper.selectAllMobile(false);
+		calcMobileHelper.selectAllMobile(false);
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'colspan', '1024');
@@ -140,18 +140,18 @@ describe('Interact with bottom toolbar.', function() {
 		cy.get('.w2ui-tb-image.w2ui-icon.alignright')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'align', 'right');
 
 		// Change alignment back
-		calc.clickOnFirstCell();
+		calcHelper.clickOnFirstCell();
 
 		cy.get('.w2ui-tb-image.w2ui-icon.alignleft')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'align', 'left');
@@ -163,7 +163,7 @@ describe('Interact with bottom toolbar.', function() {
 		cy.get('.w2ui-tb-image.w2ui-icon.alignhorizontal')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'align', 'center');
@@ -175,7 +175,7 @@ describe('Interact with bottom toolbar.', function() {
 		cy.get('.w2ui-tb-image.w2ui-icon.alignblock')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'align', 'justify');
@@ -193,7 +193,7 @@ describe('Interact with bottom toolbar.', function() {
 		cy.get('@currentTextPos')
 			.should('be.greaterThan', 0);
 
-		calc.clickOnFirstCell();
+		calcHelper.clickOnFirstCell();
 
 		cy.get('.w2ui-tb-image.w2ui-icon.wraptext')
 			.click();
@@ -219,7 +219,7 @@ describe('Interact with bottom toolbar.', function() {
 		cy.get('.w2ui-tb-image.w2ui-icon.insertrowsafter')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table tr')
 			.should('have.length', 3);
@@ -243,7 +243,7 @@ describe('Interact with bottom toolbar.', function() {
 		cy.get('.w2ui-tb-image.w2ui-icon.insertcolumnsafter')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table tr')
 			.should('have.length', 2);
diff --git a/cypress_test/integration_tests/mobile/calc/calc_helper.js b/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
similarity index 100%
rename from cypress_test/integration_tests/mobile/calc/calc_helper.js
rename to cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
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 afd69f444..3ca11f1ff 100644
--- a/cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js
@@ -1,9 +1,9 @@
 /* global describe it cy beforeEach require afterEach expect*/
 
 var helper = require('../../common/helper');
-var calc = require('../../common/calc');
+var calcHelper = require('../../common/calc_helper');
 var mobileHelper = require('../../common/mobile_helper');
-var calcHelper = require('./calc_helper');
+var calcMobileHelper = require('./calc_mobile_helper');
 
 describe('Change cell appearance.', function() {
 	var testFileName = 'cell_appearance.ods';
@@ -30,13 +30,13 @@ describe('Change cell appearance.', function() {
 	}
 
 	function openAppearencePanelOnFirtsCell() {
-		calc.clickOnFirstCell();
+		calcHelper.clickOnFirstCell();
 
 		openAppearencePanel();
 	}
 
 	function openAppearencePanelOnAllCells() {
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		openAppearencePanel();
 	}
@@ -54,7 +54,7 @@ describe('Change cell appearance.', function() {
 		cy.get('#BackgroundColor .color-sample-selected')
 			.should('have.attr', 'style', 'background-color: rgb(255, 0, 0);');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'bgcolor', '#FF0000');
@@ -66,7 +66,7 @@ describe('Change cell appearance.', function() {
 		cy.get('#border-2')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'style', 'border-left: 1px solid #000000');
@@ -79,7 +79,7 @@ describe('Change cell appearance.', function() {
 		cy.get('#border-2')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'style', 'border-left: 1px solid #000000');
@@ -90,7 +90,7 @@ describe('Change cell appearance.', function() {
 		cy.get('#border-1')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('not.have.attr', 'style');
@@ -102,7 +102,7 @@ describe('Change cell appearance.', function() {
 		cy.get('#border-3')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'style', 'border-right: 1px solid #000000');
@@ -114,7 +114,7 @@ describe('Change cell appearance.', function() {
 		cy.get('#border-4')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'style', 'border-left: 1px solid #000000; border-right: 1px solid #000000');
@@ -126,7 +126,7 @@ describe('Change cell appearance.', function() {
 		cy.get('#border-5')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'style', 'border-top: 1px solid #000000');
@@ -138,7 +138,7 @@ describe('Change cell appearance.', function() {
 		cy.get('#border-6')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'style', 'border-bottom: 1px solid #000000');
@@ -150,7 +150,7 @@ describe('Change cell appearance.', function() {
 		cy.get('#border-7')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'style', 'border-top: 1px solid #000000; border-bottom: 1px solid #000000');
@@ -162,7 +162,7 @@ describe('Change cell appearance.', function() {
 		cy.get('#border-8')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'style', 'border-top: 1px solid #000000; border-bottom: 1px solid #000000; border-left: 1px solid #000000; border-right: 1px solid #000000');
@@ -174,7 +174,7 @@ describe('Change cell appearance.', function() {
 		cy.get('#border-9')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should(function(cells) {
@@ -191,7 +191,7 @@ describe('Change cell appearance.', function() {
 		cy.get('#border-10')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should(function(cells) {
@@ -218,7 +218,7 @@ describe('Change cell appearance.', function() {
 		// TODO
 		cy.wait(200);
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should(function(cells) {
@@ -242,7 +242,7 @@ describe('Change cell appearance.', function() {
 		cy.get('#border-12')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should(function(cells) {
@@ -277,7 +277,7 @@ describe('Change cell appearance.', function() {
 		cy.get('#FrameLineColor .color-sample-selected')
 			.should('have.attr', 'style', 'background-color: rgb(255, 153, 0);');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'style', 'border-left: 1px solid #ff9900');
diff --git a/cypress_test/integration_tests/mobile/calc/focus_spec.js b/cypress_test/integration_tests/mobile/calc/focus_spec.js
index 07ed8d209..8eacfc60a 100644
--- a/cypress_test/integration_tests/mobile/calc/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/focus_spec.js
@@ -2,7 +2,7 @@
 
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
-var calc = require('../../common/calc');
+var calcHelper = require('../../common/calc_helper');
 
 describe('Calc focus tests', function() {
 	var testFileName = 'focus.ods';
@@ -27,7 +27,7 @@ describe('Calc focus tests', function() {
 			.should('be.eq', 'BODY');
 
 		// One tap on an other cell -> no focus on the document
-		calc.clickOnFirstCell();
+		calcHelper.clickOnFirstCell();
 
 		cy.get('.leaflet-marker-icon')
 			.should('be.visible');
@@ -60,7 +60,7 @@ describe('Calc focus tests', function() {
 			.should('be.eq', 'BODY');
 
 		// One tap on a cell -> no document focus
-		calc.clickOnFirstCell();
+		calcHelper.clickOnFirstCell();
 
 		cy.get('.leaflet-marker-icon')
 			.should('be.visible');
@@ -70,7 +70,7 @@ describe('Calc focus tests', function() {
 			.should('be.eq', 'BODY');
 
 		// Second tap on the same cell
-		calc.clickOnFirstCell(false);
+		calcHelper.clickOnFirstCell(false);
 
 		// Document has the focus
 		cy.document().its('activeElement.className')
@@ -88,14 +88,14 @@ describe('Calc focus tests', function() {
 		helper.assertNoKeyboardInput();
 
 		// Select the first cell to edit the same one.
-		calc.clickOnFirstCell();
+		calcHelper.clickOnFirstCell();
 
 		// No focus
 		cy.document().its('activeElement.tagName')
 			.should('be.eq', 'BODY');
 
 		// Click in the formula-bar.
-		calc.clickFormulaBar();
+		calcHelper.clickFormulaBar();
 		helper.assertCursorAndFocus();
 
 		// Type some text.
@@ -106,10 +106,10 @@ describe('Calc focus tests', function() {
 		helper.assertNoKeyboardInput();
 
 		// Select the first cell to edit the same one.
-		calc.clickOnFirstCell();
+		calcHelper.clickOnFirstCell();
 
 		// Check the text we typed.
-		calc.clickFormulaBar();
+		calcHelper.clickFormulaBar();
 		helper.assertCursorAndFocus();
 		cy.get('textarea.clipboard').type('{ctrl}a');
 		helper.expectTextForClipboard(text1);
@@ -120,8 +120,8 @@ describe('Calc focus tests', function() {
 
 		// Type some more text, at the end.
 		cy.log('Appending text at the end.');
-		calc.clickOnFirstCell();
-		calc.clickFormulaBar();
+		calcHelper.clickOnFirstCell();
+		calcHelper.clickFormulaBar();
 		helper.assertCursorAndFocus();
 		var text2 = ', this is a test.';
 		cy.get('textarea.clipboard').type(text2);
@@ -134,8 +134,8 @@ describe('Calc focus tests', function() {
 
 		// Type some more text, in the middle.
 		cy.log('Inserting text in the middle.');
-		calc.clickOnFirstCell();
-		calc.clickFormulaBar();
+		calcHelper.clickOnFirstCell();
+		calcHelper.clickFormulaBar();
 		helper.assertCursorAndFocus();
 
 		// Move cursor before text2
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 330e54ab5..7c0c2ebf7 100644
--- a/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
@@ -1,9 +1,9 @@
 /* global describe it cy beforeEach require afterEach expect*/
 
 var helper = require('../../common/helper');
-var calc = require('../../common/calc');
+var calcHelper = require('../../common/calc_helper');
 var mobileHelper = require('../../common/mobile_helper');
-var calcHelper = require('./calc_helper');
+var calcMobileHelper = require('./calc_mobile_helper');
 
 describe('Calc insertion wizard.', function() {
 	var testFileName = 'insertion_wizard.ods';
@@ -14,7 +14,7 @@ describe('Calc insertion wizard.', function() {
 		// Click on edit button
 		mobileHelper.enableEditingMobile();
 
-		calc.clickOnFirstCell();
+		calcHelper.clickOnFirstCell();
 
 		cy.get('.leaflet-marker-icon')
 			.should('be.visible');
@@ -64,7 +64,7 @@ describe('Calc insertion wizard.', function() {
 		cy.get('.blinking-cursor')
 			.should('be.visible');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td a')
 			.should('have.text', 'some text');
@@ -97,7 +97,7 @@ describe('Calc insertion wizard.', function() {
 		cy.contains('.menu-entry-with-icon', 'Date')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;MM/DD/YY');
@@ -108,7 +108,7 @@ describe('Calc insertion wizard.', function() {
 		cy.contains('.menu-entry-with-icon', 'Time')
 			.click();
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;HH:MM:SS AM/PM');
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 a80bf4716..86d76cb6c 100644
--- a/cypress_test/integration_tests/mobile/calc/number_format_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/number_format_spec.js
@@ -1,9 +1,9 @@
 /* global describe it cy beforeEach require afterEach Cypress*/
 
 var helper = require('../../common/helper');
-var calc = require('../../common/calc');
+var calcHelper = require('../../common/calc_helper');
 var mobileHelper = require('../../common/mobile_helper');
-var calcHelper = require('./calc_helper');
+var calcMobileHelper = require('./calc_mobile_helper');
 
 describe('Apply number formatting.', function() {
 	var testFileName = 'number_format.ods';
@@ -14,7 +14,7 @@ describe('Apply number formatting.', function() {
 		// Click on edit button
 		mobileHelper.enableEditingMobile();
 
-		calc.clickOnFirstCell();
+		calcHelper.clickOnFirstCell();
 
 		cy.get('.leaflet-marker-icon')
 			.should('be.visible');
@@ -62,7 +62,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#leadingzeroes input')
 			.should('have.attr', 'value', '1');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;0.00%');
@@ -94,7 +94,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#leadingzeroes input')
 			.should('have.attr', 'value', '1');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;0.00%');
@@ -119,7 +119,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#leadingzeroes input')
 			.should('have.attr', 'value', '1');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;[$$-409]#,##0.00;[RED]-[$$-409]#,##0.00');
@@ -151,7 +151,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#leadingzeroes input')
 			.should('have.attr', 'value', '1');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;[$$-409]#,##0.00;[RED]-[$$-409]#,##0.00');
@@ -180,7 +180,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#leadingzeroes input')
 			.should('have.attr', 'value', '1');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;[$$-409]#,##0.00;[RED]-[$$-409]#,##0.00');
@@ -188,7 +188,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#copy-paste-container table td')
 			.should('have.text', '$1,000.00');
 
-		calc.clickOnFirstCell();
+		calcHelper.clickOnFirstCell();
 
 		mobileHelper.openMobileWizard();
 
@@ -209,7 +209,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#numberformatcombobox .ui-header-left')
 			.should('have.text', 'Number');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.text', '1,000.00');
@@ -234,7 +234,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#leadingzeroes input')
 			.should('have.attr', 'value', '0');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;MM/DD/YY');
@@ -256,7 +256,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#leadingzeroes input')
 			.should('have.attr', 'value', '0');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;HH:MM:SS AM/PM');
@@ -278,7 +278,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#leadingzeroes input')
 			.should('have.attr', 'value', '1');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;0.00E+00');
@@ -297,7 +297,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#leadingzeroes input')
 			.should('have.attr', 'value', '0');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;# ?/?');
@@ -316,7 +316,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#leadingzeroes input')
 			.should('have.attr', 'value', '0');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;BOOLEAN');
@@ -335,7 +335,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#leadingzeroes input')
 			.should('have.attr', 'value', '0');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;@');
@@ -357,7 +357,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#decimalplaces input')
 			.should('have.attr', 'value', '2');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;0.00');
@@ -379,7 +379,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#leadingzeroes input')
 			.should('have.attr', 'value', '6');
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;000000');
@@ -400,7 +400,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#negativenumbersred input')
 			.should('have.prop', 'checked', true);
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;0;[RED]-0');
@@ -421,7 +421,7 @@ describe('Apply number formatting.', function() {
 		cy.get('#thousandseparator input')
 			.should('have.prop', 'checked', true);
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('have.attr', 'sdnum', '1033;0;#,##0');
diff --git a/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js b/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js
index 198603ba8..e19e9a07e 100644
--- a/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js
@@ -1,9 +1,9 @@
 /* global describe it cy beforeEach require afterEach expect*/
 
 var helper = require('../../common/helper');
-var calc = require('../../common/calc');
+var calcHelper = require('../../common/calc_helper');
 var mobileHelper = require('../../common/mobile_helper');
-var calcHelper = require('./calc_helper');
+var calcMobileHelper = require('./calc_mobile_helper');
 
 describe('Calc spell checking menu.', function() {
 	var testFileName = 'spellchecking.ods';
@@ -21,7 +21,7 @@ describe('Calc spell checking menu.', function() {
 
 	function openContextMenu() {
 		// Step into edit mode
-		calc.dblClickOnFirstCell();
+		calcHelper.dblClickOnFirstCell();
 
 		// Select text content
 		cy.get('textarea.clipboard')
@@ -42,10 +42,10 @@ describe('Calc spell checking menu.', function() {
 				}
 
 				// Remove selection
-				calcHelper.removeTextSelection();
+				calcMobileHelper.removeTextSelection();
 
 				// Step into edit mode again
-				calc.dblClickOnFirstCell();
+				calcHelper.dblClickOnFirstCell();
 
 				mobileHelper.longPressOnDocument(XPos, YPos);
 			});
@@ -70,7 +70,7 @@ describe('Calc spell checking menu.', function() {
 					.click(XPos, YPos);
 			});
 
-		calcHelper.selectAllMobile();
+		calcMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
 			.should('contain.text', 'hello');
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 e784bbc3f..5d03f535e 100644
--- a/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
@@ -2,7 +2,7 @@
 
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
-var impress = require('../../common/impress');
+var impressHelper = require('../../common/impress_helper');
 
 describe('Impress focus tests', function() {
 	var testFileName = 'focus.odp';
@@ -19,7 +19,7 @@ describe('Impress focus tests', function() {
 
 		mobileHelper.enableEditingMobile();
 
-		impress.assertNotInTextEditMode();
+		impressHelper.assertNotInTextEditMode();
 
 		// Body has the focus -> can't type in the document
 		cy.document().its('activeElement.tagName')
@@ -49,26 +49,26 @@ describe('Impress focus tests', function() {
 			.should('exist');
 
 		// But no editing.
-		impress.assertNotInTextEditMode();
+		impressHelper.assertNotInTextEditMode();
 	});
 
 	it('Double-click to edit', function() {
 
 		mobileHelper.enableEditingMobile();
 
-		impress.assertNotInTextEditMode();
+		impressHelper.assertNotInTextEditMode();
 
 		// Enter edit mode by double-clicking.
 		cy.get('#document-container')
 			.dblclick();
 
-		impress.typeTextAndVerify('Hello Impress');
+		impressHelper.typeTextAndVerify('Hello Impress');
 
 		// End editing.
 		cy.get('#document-container')
 			.type('{esc}');
 
-		impress.assertNotInTextEditMode();
+		impressHelper.assertNotInTextEditMode();
 
 		// Enter edit mode by double-clicking again.
 		cy.get('#document-container')
@@ -77,14 +77,14 @@ describe('Impress focus tests', function() {
 		// Clear the text.
 		helper.clearAllText();
 
-		impress.typeTextAndVerify('Bazinga Impress');
+		impressHelper.typeTextAndVerify('Bazinga Impress');
 	});
 
 	it('Single-click to edit', function() {
 
 		mobileHelper.enableEditingMobile();
 
-		impress.assertNotInTextEditMode();
+		impressHelper.assertNotInTextEditMode();
 
 		cy.get('#document-container')
 			.then(function(items) {
@@ -99,13 +99,13 @@ describe('Impress focus tests', function() {
 				cy.get('#document-container')
 					.click(posX, posY);
 
-				impress.typeTextAndVerify('Hello Impress');
+				impressHelper.typeTextAndVerify('Hello Impress');
 
 				// End editing.
 				cy.get('#document-container')
 					.type('{esc}');
 
-				impress.assertNotInTextEditMode();
+				impressHelper.assertNotInTextEditMode();
 
 				// Single-click to re-edit.
 				cy.get('#document-container')
@@ -115,18 +115,18 @@ describe('Impress focus tests', function() {
 						cy.get('#document-container')
 							.click(posX, posY);
 
-						impress.assertInTextEditMode();
+						impressHelper.assertInTextEditMode();
 
 						// Clear the text.
 						helper.clearAllText();
 
-						impress.typeTextAndVerify('Bazinga Impress');
+						impressHelper.typeTextAndVerify('Bazinga Impress');
 
 						// End editing.
 						cy.get('#document-container')
 							.type('{esc}');
 
-						impress.assertNotInTextEditMode();
+						impressHelper.assertNotInTextEditMode();
 					});
 			});
 	});
diff --git a/cypress_test/integration_tests/mobile/impress/impress_helper.js b/cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js
similarity index 100%
rename from cypress_test/integration_tests/mobile/impress/impress_helper.js
rename to cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js
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 66f08c90a..588e36eeb 100644
--- a/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
@@ -2,7 +2,7 @@
 
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
-var writerHelper = require('./writer_helper');
+var writerMobileHelper = require('./writer_mobile_helper');
 
 describe('Apply font changes.', function() {
 	var testFileName = 'apply_font.odt';
@@ -14,7 +14,7 @@ describe('Apply font changes.', function() {
 		mobileHelper.enableEditingMobile();
 
 		// Do a new selection
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		mobileHelper.openMobileWizard();
 	});
@@ -25,7 +25,7 @@ describe('Apply font changes.', function() {
 
 	function applyStyle(styleName) {
 		// Do a new selection
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		mobileHelper.openMobileWizard();
 
@@ -66,7 +66,7 @@ describe('Apply font changes.', function() {
 		cy.get('#fontnamecombobox .ui-header-right .entry-value')
 			.should('have.text', 'Linux Libertine G');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p font')
 			.should('have.attr', 'face', 'Linux Libertine G');
@@ -94,7 +94,7 @@ describe('Apply font changes.', function() {
 		cy.get('#fontsizecombobox .ui-header-right .entry-value')
 			.should('have.text', '36');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p font')
 			.should('have.attr', 'style', 'font-size: 36pt');
@@ -105,7 +105,7 @@ describe('Apply font changes.', function() {
 		cy.get('#Bold')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p b')
 			.should('exist');
@@ -116,7 +116,7 @@ describe('Apply font changes.', function() {
 		cy.get('#Italic')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p i')
 			.should('exist');
@@ -127,7 +127,7 @@ describe('Apply font changes.', function() {
 		cy.get('#Underlineimg')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p u')
 			.should('exist');
@@ -138,7 +138,7 @@ describe('Apply font changes.', function() {
 		cy.get('#Strikeoutimg')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p strike')
 			.should('exist');
@@ -149,7 +149,7 @@ describe('Apply font changes.', function() {
 		cy.get('#Shadowedimg')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// TODO: Shadowed is not in the clipboard content.
 	});
@@ -159,7 +159,7 @@ describe('Apply font changes.', function() {
 		cy.get('#Growimg')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p font')
 			.should('have.attr', 'style', 'font-size: 42pt');
@@ -170,7 +170,7 @@ describe('Apply font changes.', function() {
 		cy.get('#Shrinkimg')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p font')
 			.should('have.attr', 'style', 'font-size: 38pt');
@@ -183,7 +183,7 @@ describe('Apply font changes.', function() {
 
 		mobileHelper.selectFromColorPalette(0, 5, 2);
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p font')
 			.should('have.attr', 'color', '#6aa84f');
@@ -196,7 +196,7 @@ describe('Apply font changes.', function() {
 
 		mobileHelper.selectFromColorPalette(1, 5, 4);
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p font span')
 			.should('have.attr', 'style', 'background: #93c47d');
@@ -207,7 +207,7 @@ describe('Apply font changes.', function() {
 		cy.get('#SuperScriptimg')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p sup')
 			.should('exist');
@@ -218,7 +218,7 @@ describe('Apply font changes.', function() {
 		cy.get('#SubScriptimg')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p sub')
 			.should('exist');
@@ -240,7 +240,7 @@ describe('Apply font changes.', function() {
 		// Apply Title style
 		applyStyle('Title');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p font')
 			.should('have.attr', 'face', 'Liberation Sans, sans-serif');
@@ -250,7 +250,7 @@ describe('Apply font changes.', function() {
 		// Clear formatting
 		applyStyle('Clear formatting');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'style', 'margin-bottom: 0in; line-height: 100%');
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 cad5333ae..8aa33e67f 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
@@ -2,7 +2,7 @@
 
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
-var writerHelper = require('./writer_helper');
+var writerMobileHelper = require('./writer_mobile_helper');
 
 describe('Apply paragraph properties.', function() {
 	var testFileName = 'apply_paragraph_properties.odt';
@@ -14,7 +14,7 @@ describe('Apply paragraph properties.', function() {
 		mobileHelper.enableEditingMobile();
 
 		// Do a selection
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		mobileHelper.openMobileWizard();
 
@@ -44,7 +44,7 @@ describe('Apply paragraph properties.', function() {
 		cy.get('#LeftParaimg')
 			.should('have.class', 'selected');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'align', 'left');
@@ -55,7 +55,7 @@ describe('Apply paragraph properties.', function() {
 		cy.get('#CenterPara')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'align', 'center');
@@ -66,7 +66,7 @@ describe('Apply paragraph properties.', function() {
 		cy.get('#RightPara')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'align', 'right');
@@ -77,7 +77,7 @@ describe('Apply paragraph properties.', function() {
 		cy.get('#JustifyPara')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'align', 'justify');
@@ -88,13 +88,13 @@ describe('Apply paragraph properties.', function() {
 		cy.get('#ParaRightToLeft')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'dir', 'rtl');
 
 		// Select text
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		mobileHelper.openMobileWizard();
 
@@ -106,7 +106,7 @@ describe('Apply paragraph properties.', function() {
 		cy.get('#ParaLeftToRight')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('not.have.attr', 'dir');
@@ -121,7 +121,7 @@ describe('Apply paragraph properties.', function() {
 		cy.get('#DefaultBullet')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container ul li p')
 			.should('exist');
@@ -136,7 +136,7 @@ describe('Apply paragraph properties.', function() {
 		cy.get('#DefaultNumbering')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container ol li p')
 			.should('exist');
@@ -154,7 +154,7 @@ describe('Apply paragraph properties.', function() {
 
 		mobileHelper.selectFromColorPalette(2, 5, 2);
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'style')
@@ -168,7 +168,7 @@ describe('Apply paragraph properties.', function() {
 		cy.get('#ParaspaceIncrease')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'style')
@@ -179,7 +179,7 @@ describe('Apply paragraph properties.', function() {
 			.should('contain', 'margin-bottom: 0.08in');
 
 		// Select text
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		mobileHelper.openMobileWizard();
 
@@ -191,7 +191,7 @@ describe('Apply paragraph properties.', function() {
 		cy.get('#ParaspaceDecrease')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'style')
@@ -228,7 +228,7 @@ describe('Apply paragraph properties.', function() {
 		cy.get('#belowparaspacing .spinfield')
 			.should('have.attr', 'value', '0.02');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'style')
@@ -246,14 +246,14 @@ describe('Apply paragraph properties.', function() {
 		cy.get('#IncrementIndent')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'style')
 			.should('contain', 'margin-left: 0.98in');
 
 		// Select text
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		mobileHelper.openMobileWizard();
 
@@ -265,7 +265,7 @@ describe('Apply paragraph properties.', function() {
 		cy.get('#DecrementIndent')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'style')
@@ -283,7 +283,7 @@ describe('Apply paragraph properties.', function() {
 		cy.get('#beforetextindent .spinfield')
 			.should('have.attr', 'value', '0.04');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'style')
@@ -301,7 +301,7 @@ describe('Apply paragraph properties.', function() {
 		cy.get('#aftertextindent .spinfield')
 			.should('have.attr', 'value', '0.04');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'style')
@@ -319,7 +319,7 @@ describe('Apply paragraph properties.', function() {
 		cy.get('#firstlineindent .spinfield')
 			.should('have.attr', 'value', '0.04');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'style')
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 771ca3e4b..a866f1d68 100644
--- a/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js
@@ -2,7 +2,7 @@
 
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
-var writerHelper = require('./writer_helper');
+var writerMobileHelper = require('./writer_mobile_helper');
 
 describe('Pushing bottom toolbar items.', function() {
 	var testFileName = 'bottom_toolbar.odt';
@@ -14,7 +14,7 @@ describe('Pushing bottom toolbar items.', function() {
 		mobileHelper.enableEditingMobile();
 
 		// Do a new selection
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 	});
 
 	afterEach(function() {
@@ -31,7 +31,7 @@ describe('Pushing bottom toolbar items.', function() {
 		cy.get('#tb_editbar_item_bold div table')
 			.should('have.class', 'checked');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p b')
 			.should('exist');
@@ -47,7 +47,7 @@ describe('Pushing bottom toolbar items.', function() {
 		cy.get('#tb_editbar_item_italic div table')
 			.should('have.class', 'checked');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p i')
 			.should('exist');
@@ -62,7 +62,7 @@ describe('Pushing bottom toolbar items.', function() {
 		cy.get('#tb_editbar_item_underline div table')
 			.should('have.class', 'checked');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p u')
 			.should('exist');
@@ -78,7 +78,7 @@ describe('Pushing bottom toolbar items.', function() {
 		cy.get('#tb_editbar_item_strikeout div table')
 			.should('have.class', 'checked');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p strike')
 			.should('exist');
@@ -93,7 +93,7 @@ describe('Pushing bottom toolbar items.', function() {
 		cy.get('.w2ui-tb-image.w2ui-icon.textcolor')
 			.should('have.attr', 'style', 'box-shadow: rgb(255, 255, 255) 0px -2px inset, rgb(0, 0, 255) 0px -6px inset;');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p font')
 			.should('have.attr', 'color', '#0000ff');
@@ -108,7 +108,7 @@ describe('Pushing bottom toolbar items.', function() {
 		cy.get('.w2ui-tb-image.w2ui-icon.backcolor')
 			.should('have.attr', 'style', 'box-shadow: rgb(255, 255, 255) 0px -2px inset, rgb(255, 0, 255) 0px -6px inset;');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p font span')
 			.should('have.attr', 'style', 'background: #ff00ff');
@@ -124,7 +124,7 @@ describe('Pushing bottom toolbar items.', function() {
 		cy.get('#tb_editbar_item_rightpara div table')
 			.should('have.class', 'checked');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'align', 'right');
@@ -138,7 +138,7 @@ describe('Pushing bottom toolbar items.', function() {
 		cy.get('#tb_editbar_item_leftpara div table')
 			.should('have.class', 'checked');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'align', 'left');
@@ -154,7 +154,7 @@ describe('Pushing bottom toolbar items.', function() {
 		cy.get('#tb_editbar_item_centerpara div table')
 			.should('have.class', 'checked');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'align', 'center');
@@ -170,7 +170,7 @@ describe('Pushing bottom toolbar items.', function() {
 		cy.get('#tb_editbar_item_justifypara div table')
 			.should('have.class', 'checked');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'align', 'justify');
@@ -186,7 +186,7 @@ describe('Pushing bottom toolbar items.', function() {
 		cy.get('#tb_editbar_item_defaultnumbering div table')
 			.should('have.class', 'checked');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container ol li p')
 			.should('exist');
@@ -202,7 +202,7 @@ describe('Pushing bottom toolbar items.', function() {
 		cy.get('#tb_editbar_item_defaultbullet div table')
 			.should('have.class', 'checked');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container ul li p')
 			.should('exist');
@@ -212,7 +212,7 @@ describe('Pushing bottom toolbar items.', function() {
 		cy.get('#tb_editbar_item_incrementindent')
 			.click().click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'style')
@@ -221,7 +221,7 @@ describe('Pushing bottom toolbar items.', function() {
 		cy.get('#tb_editbar_item_decrementindent')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.attr', 'style')
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 1a6930bea..41147dd3b 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
@@ -2,7 +2,7 @@
 
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
-var writerHelper = require('./writer_helper');
+var writerMobileHelper = require('./writer_mobile_helper');
 
 describe('Insert fields via insertion wizard.', function() {
 	var testFileName = 'insert_field.odt';
@@ -32,7 +32,7 @@ describe('Insert fields via insertion wizard.', function() {
 		cy.contains('.menu-entry-with-icon', 'Page Number')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p span sdfield')
 			.should('have.attr', 'type', 'PAGE')
@@ -44,7 +44,7 @@ describe('Insert fields via insertion wizard.', function() {
 		cy.contains('.menu-entry-with-icon', 'Page Count')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p span sdfield')
 			.should('have.attr', 'type', 'DOCSTAT')
@@ -56,7 +56,7 @@ describe('Insert fields via insertion wizard.', function() {
 		cy.contains('.menu-entry-with-icon', 'Date')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p span sdfield')
 			.should('have.attr', 'type', 'DATETIME')
@@ -68,7 +68,7 @@ describe('Insert fields via insertion wizard.', function() {
 		cy.contains('.menu-entry-with-icon', 'Time')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p span sdfield')
 			.should('have.attr', 'type', 'DATETIME')
@@ -80,7 +80,7 @@ describe('Insert fields via insertion wizard.', function() {
 		cy.contains('.menu-entry-with-icon', 'Title')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p span sdfield')
 			.should('have.attr', 'type', 'DOCINFO')
@@ -92,7 +92,7 @@ describe('Insert fields via insertion wizard.', function() {
 		cy.contains('.menu-entry-with-icon', 'First Author')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p span sdfield')
 			.should('have.attr', 'type', 'DOCINFO')
@@ -105,7 +105,7 @@ describe('Insert fields via insertion wizard.', function() {
 		cy.contains('.menu-entry-with-icon', 'Subject')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p span sdfield')
 			.should('have.attr', 'type', 'DOCINFO')
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 bf4a2c263..045bf3502 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
@@ -2,7 +2,7 @@
 
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
-var writerHelper = require('./writer_helper');
+var writerMobileHelper = require('./writer_mobile_helper');
 
 describe('Insert formatting mark via insertion wizard.', function() {
 	var testFileName = 'insert_formatting_mark.odt';
@@ -31,7 +31,7 @@ describe('Insert formatting mark via insertion wizard.', function() {
 		cy.contains('.menu-entry-with-icon', 'Non-breaking space')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('contain.text', '\u00a0');
@@ -41,7 +41,7 @@ describe('Insert formatting mark via insertion wizard.', function() {
 		cy.contains('.menu-entry-with-icon', 'Non-breaking hyphen')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('contain.text', '\u2011');
@@ -51,7 +51,7 @@ describe('Insert formatting mark via insertion wizard.', function() {
 		cy.contains('.menu-entry-with-icon', 'Soft hyphen')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('contain.text', '\u00ad');
@@ -61,7 +61,7 @@ describe('Insert formatting mark via insertion wizard.', function() {
 		cy.contains('.menu-entry-with-icon', 'No-width optional break')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('contain.text', '\u200b');
@@ -71,7 +71,7 @@ describe('Insert formatting mark via insertion wizard.', function() {
 		cy.contains('.menu-entry-with-icon', 'No-width no break')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('contain.text', '\u2060');
@@ -81,7 +81,7 @@ describe('Insert formatting mark via insertion wizard.', function() {
 		cy.contains('.menu-entry-with-icon', 'Left-to-right mark')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('contain.text', '\u200e');
@@ -91,7 +91,7 @@ describe('Insert formatting mark via insertion wizard.', function() {
 		cy.contains('.menu-entry-with-icon', 'Right-to-left mark')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('contain.text', '\u200f');
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 2e51a718a..7410c237a 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
@@ -2,7 +2,7 @@
 
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
-var writerHelper = require('./writer_helper');
+var writerMobileHelper = require('./writer_mobile_helper');
 
 describe('Insert objects via insertion wizard.', function() {
 	var testFileName = 'insert_object.odt';
@@ -86,7 +86,7 @@ describe('Insert objects via insertion wizard.', function() {
 		cy.get('.leaflet-marker-icon.table-column-resize-marker')
 			.should('exist');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// Two rows
 		cy.get('#copy-paste-container tr')
@@ -124,7 +124,7 @@ describe('Insert objects via insertion wizard.', function() {
 		cy.get('.leaflet-marker-icon.table-column-resize-marker')
 			.should('exist');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// Three rows
 		cy.get('#copy-paste-container tr')
@@ -311,7 +311,7 @@ describe('Insert objects via insertion wizard.', function() {
 		cy.get('.vex-content.hyperlink-dialog .vex-dialog-button-primary')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container p')
 			.should('have.text', '\nsome text');
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 550f91672..278c41c54 100644
--- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
@@ -2,7 +2,7 @@
 
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
-var writerHelper = require('./writer_helper');
+var writerMobileHelper = require('./writer_mobile_helper');
 
 describe('Change shape properties via mobile wizard.', function() {
 	var defaultGeometry = 'M 1965,4863 L 7957,10855 1965,10855 1965,4863 1965,4863 Z';
@@ -14,7 +14,7 @@ describe('Change shape properties via mobile wizard.', function() {
 		// Click on edit button
 		mobileHelper.enableEditingMobile();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#document-container')
 			.type('{home}');
diff --git a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
index 8f5c9d297..674b14d94 100644
--- a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
@@ -2,7 +2,7 @@
 
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
-var writerHelper = require('./writer_helper');
+var writerMobileHelper = require('./writer_mobile_helper');
 
 describe('Spell checking menu.', function() {
 	var testFileName = 'spellchecking.odt';
@@ -20,7 +20,7 @@ describe('Spell checking menu.', function() {
 
 	function openContextMenu() {
 		// Do a new selection
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// Open context menu
 		cy.get('.leaflet-marker-icon')
@@ -55,7 +55,7 @@ describe('Spell checking menu.', function() {
 		cy.contains('.context-menu-link', 'hello')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		helper.expectTextForClipboard('hello');
 	});
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 c082ee1f5..664840f52 100644
--- a/cypress_test/integration_tests/mobile/writer/table_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/table_properties_spec.js
@@ -2,7 +2,7 @@
 
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
-var writerHelper = require('./writer_helper');
+var writerMobileHelper = require('./writer_mobile_helper');
 
 describe('Change table properties / layout via mobile wizard.', function() {
 	var testFileName = 'spellchecking.odt';
@@ -31,7 +31,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 	}
 
 	function moveCursorToFirstCell() {
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('.blinking-cursor')
 			.then(function(cursor) {
@@ -59,7 +59,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('.leaflet-marker-icon.table-row-resize-marker')
 			.should('have.length', 4);
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// Check rows / columns
 		cy.get('#copy-paste-container tr')
@@ -88,7 +88,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('.leaflet-marker-icon.table-row-resize-marker')
 			.should('have.length', 4);
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// Check rows / columns
 		cy.get('#copy-paste-container tr')
@@ -117,7 +117,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('.leaflet-marker-icon.table-column-resize-marker')
 			.should('have.length', 4);
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// Check rows / columns
 		cy.get('#copy-paste-container tr')
@@ -146,7 +146,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('.leaflet-marker-icon.table-column-resize-marker')
 			.should('have.length', 4);
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// Check rows / columns
 		cy.get('#copy-paste-container tr')
@@ -175,7 +175,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('.leaflet-marker-icon.table-row-resize-marker')
 			.should('have.length', 2);
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// Check rows / columns
 		cy.get('#copy-paste-container tr')
@@ -204,7 +204,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('.leaflet-marker-icon.table-column-resize-marker')
 			.should('not.exist');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// Check rows / columns
 		cy.get('#copy-paste-container tr')
@@ -237,7 +237,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		mobileHelper.closeMobileWizard();
 
 		// Do a new selection
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// Check markers are in the same row (we have text selection only)
 		cy.get('.leaflet-marker-icon')
@@ -266,7 +266,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#MergeCells')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// Check rows / columns
 		cy.get('#copy-paste-container tr')
@@ -296,7 +296,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#rowheight .spinfield')
 			.should('have.attr', 'value', '1.4');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// Check row height
 		cy.get('#copy-paste-container td')
@@ -324,7 +324,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#columnwidth .spinfield')
 			.should('have.attr', 'value', '5.6');
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// Check row height
 		cy.get('#copy-paste-container td')
@@ -349,7 +349,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#SetMinimalRowHeight')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// Check new row height
 		cy.get('#copy-paste-container td')
@@ -373,7 +373,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#SetOptimalRowHeight')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// Check new row height
 		cy.get('#copy-paste-container td')
@@ -407,7 +407,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#DistributeRows')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		// Check new row height
 		cy.get('#copy-paste-container td')
@@ -441,7 +441,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#SetMinimalColumnWidth')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container td')
 			.should('have.attr', 'width', '24');
@@ -464,7 +464,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#SetOptimalColumnWidth')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container td:nth-of-type(1n)')
 			.should('have.attr', 'width', '324');
@@ -489,7 +489,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#DistributeColumns')
 			.click();
 
-		writerHelper.selectAllMobile();
+		writerMobileHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container td')
 			.should('have.attr', 'width', '323');
diff --git a/cypress_test/integration_tests/mobile/writer/writer_helper.js b/cypress_test/integration_tests/mobile/writer/writer_mobile_helper.js
similarity index 100%
rename from cypress_test/integration_tests/mobile/writer/writer_helper.js
rename to cypress_test/integration_tests/mobile/writer/writer_mobile_helper.js


More information about the Libreoffice-commits mailing list