diff options
author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2020-11-16 15:39:19 +0100 |
---|---|---|
committer | Tamás Zolnai <zolnaitamas2000@gmail.com> | 2020-11-16 17:50:15 +0100 |
commit | 3f4468a497e72c0f1de6ac581f394e18d607800b (patch) | |
tree | c16797bb64b677982a948ad5d9e3dc8b00d99b3b /cypress_test | |
parent | Created a Cypress test for Left and Right border, Top border, Bottom border (diff) | |
download | online-3f4468a497e72c0f1de6ac581f394e18d607800b.tar.gz online-3f4468a497e72c0f1de6ac581f394e18d607800b.zip |
cypress: merge some selection helper methods.
To reuse as much code as we can. We can use the same
method on mobile and on desktop.
Change-Id: I15b1038313145db6cb6ea07489c0d30a0fc2ce64
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'cypress_test')
16 files changed, 189 insertions, 197 deletions
diff --git a/cypress_test/integration_tests/common/helper.js b/cypress_test/integration_tests/common/helper.js index 773cfac366..181b5a07ed 100644 --- a/cypress_test/integration_tests/common/helper.js +++ b/cypress_test/integration_tests/common/helper.js @@ -320,22 +320,6 @@ function selectAllText(assertFocus = true) { .should('exist'); } -function reselectAllText() { - - cy.log('Unselect all texts'); - - typeIntoDocument('{downarrow}'); - - cy.get('.leaflet-marker-icon') - .should('not.exist'); - - typeIntoDocument('{ctrl}a'); - - cy.get('.leaflet-marker-icon') - .should('exist'); - cy.log('Reselect all texts'); -} - // Clear all text by selecting all and deleting. function clearAllText() { assertCursorAndFocus(); @@ -850,7 +834,6 @@ module.exports.assertCursorAndFocus = assertCursorAndFocus; module.exports.assertNoKeyboardInput = assertNoKeyboardInput; module.exports.assertHaveKeyboardInput = assertHaveKeyboardInput; module.exports.selectAllText = selectAllText; -module.exports.reselectAllText = reselectAllText; module.exports.clearAllText = clearAllText; module.exports.expectTextForClipboard = expectTextForClipboard; module.exports.matchClipboardText = matchClipboardText; diff --git a/cypress_test/integration_tests/common/writer_helper.js b/cypress_test/integration_tests/common/writer_helper.js new file mode 100644 index 0000000000..fcf8b60310 --- /dev/null +++ b/cypress_test/integration_tests/common/writer_helper.js @@ -0,0 +1,24 @@ +/* global cy require*/ + +var helper = require('./helper'); + +function selectAllTextOfDoc() { + cy.log('Select all text of Writer document - start.'); + + // Remove selection if exist + cy.get('.leaflet-marker-pane') + .then(function(body) { + if (body.find('.leaflet-selection-marker-start').length !== 0) { + helper.typeIntoDocument('{downarrow}'); + } + }); + + cy.get('.leaflet-selection-marker-start') + .should('not.exist'); + + helper.selectAllText(false); + + cy.log('Select all text of Writer document - end.'); +} + +module.exports.selectAllTextOfDoc = selectAllTextOfDoc; diff --git a/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js b/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js index 79ebd7edb6..fa1ec4f3cf 100644 --- a/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js +++ b/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js @@ -2,6 +2,7 @@ var helper = require('../../common/helper'); var desktopHelper = require('../../common/desktop_helper'); +var writerHelper = require('../../common/writer_helper'); describe('Top toolbar tests.', function() { var testFileName = 'top_toolbar.odt'; @@ -13,7 +14,7 @@ describe('Top toolbar tests.', function() { desktopHelper.showSidebarIfHidden(); } - helper.selectAllText(false); + writerHelper.selectAllTextOfDoc(); }); afterEach(function() { @@ -27,7 +28,7 @@ describe('Top toolbar tests.', function() { cy.get('.w2ui-color [name="FFF2CC"]') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p font span') .should('have.attr', 'style', 'background: #fff2cc'); @@ -40,7 +41,7 @@ describe('Top toolbar tests.', function() { cy.get('.w2ui-color [name="8E7CC3"]') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p font') .should('have.attr', 'color', '#8e7cc3'); @@ -72,7 +73,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_bold') .click(); - helper.selectAllText(false); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p b') .should('exist'); @@ -82,7 +83,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_italic') .click(); - helper.selectAllText(false); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p i') .should('exist'); @@ -92,7 +93,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_underline') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p u') .should('exist'); @@ -102,7 +103,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_strikeout') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p strike') .should('exist'); @@ -123,7 +124,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_bold') .click(); - helper.selectAllText(false); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p b') .should('exist'); @@ -131,7 +132,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_reset') .click(); - helper.selectAllText(false); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p b') .should('not.exist'); @@ -141,7 +142,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_rightpara') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'align', 'right'); @@ -149,7 +150,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_leftpara') .click(); - helper.selectAllText(false); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'align', 'left'); @@ -159,7 +160,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_centerpara') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'align', 'center'); @@ -169,7 +170,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_justifypara') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'align', 'justify'); @@ -182,7 +183,7 @@ describe('Top toolbar tests.', function() { cy.contains('.menu-text', 'Line Spacing: 1.5') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') @@ -194,7 +195,7 @@ describe('Top toolbar tests.', function() { cy.contains('.menu-text', 'Line Spacing: 1') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') @@ -208,7 +209,7 @@ describe('Top toolbar tests.', function() { cy.contains('.menu-text', 'Line Spacing: 2') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') @@ -222,13 +223,13 @@ describe('Top toolbar tests.', function() { cy.contains('.menu-text', 'Increase Paragraph Spacing') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') .should('contain', 'margin-top: 0.04in'); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); //Decrease Paragraph Spacing cy.get('#tb_editbar_item_linespacing') @@ -237,7 +238,7 @@ describe('Top toolbar tests.', function() { cy.contains('.menu-text', 'Decrease Paragraph Spacing') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') @@ -248,7 +249,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_defaultnumbering') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container ol') .should('exist'); @@ -258,7 +259,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_defaultbullet') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container ul') .should('exist'); @@ -272,7 +273,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_incrementindent') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') @@ -282,7 +283,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_decrementindent') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') @@ -321,7 +322,9 @@ describe('Top toolbar tests.', function() { cy.get('.inserttable-grid > .row > .col').eq(3) .click(); - helper.reselectAllText(); + // Move cursor outside of the table to make selection work. + helper.moveCursor('down'); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container table') .should('exist'); @@ -363,7 +366,7 @@ describe('Top toolbar tests.', function() { cy.get('.vex-dialog-button-primary.vex-dialog-button.vex-first') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.text', '\ntextlink'); @@ -406,7 +409,7 @@ describe('Top toolbar tests.', function() { helper.beforeAll(testFileName, 'writer', true); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p b') .should('exist'); @@ -429,7 +432,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_italic') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p i') .should('exist'); @@ -439,7 +442,7 @@ describe('Top toolbar tests.', function() { .should('not.have.class', 'disabled') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p i') .should('not.exist'); @@ -449,7 +452,7 @@ describe('Top toolbar tests.', function() { .should('not.have.class', 'disabled') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p i') .should('exist'); @@ -536,7 +539,7 @@ describe('Top toolbar tests.', function() { .click(XPos, YPos); }); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); // Full word should have bold font. cy.get('#copy-paste-container p b') 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 1cd32a3f85..a66f21be6e 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 writerMobileHelper = require('./writer_mobile_helper'); +var writerHelper = require('../../common/writer_helper'); describe('Apply font changes.', function() { var testFileName = 'apply_font.odt'; @@ -10,11 +10,9 @@ describe('Apply font changes.', function() { beforeEach(function() { helper.beforeAll(testFileName, 'writer'); - // Click on edit button mobileHelper.enableEditingMobile(); - // Do a new selection - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); mobileHelper.openMobileWizard(); }); @@ -24,8 +22,7 @@ describe('Apply font changes.', function() { }); function applyStyle(styleName) { - // Do a new selection - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); mobileHelper.openMobileWizard(); @@ -59,7 +56,7 @@ describe('Apply font changes.', function() { cy.get('#fontnamecombobox .ui-header-right .entry-value') .should('have.text', 'Linux Libertine G'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p font') .should('have.attr', 'face', 'Linux Libertine G'); @@ -84,7 +81,7 @@ describe('Apply font changes.', function() { cy.get('#fontsizecombobox .ui-header-right .entry-value') .should('have.text', '36'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p font') .should('have.attr', 'style', 'font-size: 36pt'); @@ -93,7 +90,7 @@ describe('Apply font changes.', function() { it('Apply bold font.', function() { helper.clickOnIdle('#Bold'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p b') .should('exist'); @@ -102,7 +99,7 @@ describe('Apply font changes.', function() { it('Apply italic font.', function() { helper.clickOnIdle('#Italic'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p i') .should('exist'); @@ -111,7 +108,7 @@ describe('Apply font changes.', function() { it('Apply underline.', function() { helper.clickOnIdle('#Underline'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p u') .should('exist'); @@ -120,7 +117,7 @@ describe('Apply font changes.', function() { it('Apply strikeout.', function() { helper.clickOnIdle('#Strikeout'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p strike') .should('exist'); @@ -129,7 +126,7 @@ describe('Apply font changes.', function() { it('Apply shadowed.', function() { helper.clickOnIdle('#Shadowed'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); // TODO: Shadowed is not in the clipboard content. }); @@ -137,7 +134,7 @@ describe('Apply font changes.', function() { it('Apply grow.', function() { helper.clickOnIdle('#Grow'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p font') .should('have.attr', 'style', 'font-size: 42pt'); @@ -146,7 +143,7 @@ describe('Apply font changes.', function() { it('Apply shrink.', function() { helper.clickOnIdle('#Shrink'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p font') .should('have.attr', 'style', 'font-size: 38pt'); @@ -157,7 +154,7 @@ describe('Apply font changes.', function() { mobileHelper.selectFromColorPalette(0, 5, 2); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p font') .should('have.attr', 'color', '#6aa84f'); @@ -170,7 +167,7 @@ describe('Apply font changes.', function() { mobileHelper.closeMobileWizard(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p font') .should('have.attr', 'color', '#ff0000'); @@ -181,7 +178,7 @@ describe('Apply font changes.', function() { helper.clickOnIdle('.colors-container-auto-color-row'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p font') .should('have.attr', 'color', '#000000'); @@ -192,7 +189,7 @@ describe('Apply font changes.', function() { mobileHelper.selectFromColorPalette(1, 5, 4); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p font span') .should('have.attr', 'style', 'background: #93c47d'); @@ -201,7 +198,7 @@ describe('Apply font changes.', function() { it('Apply superscript.', function() { helper.clickOnIdle('#SuperScript'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p sup') .should('exist'); @@ -210,7 +207,7 @@ describe('Apply font changes.', function() { it('Apply subscript.', function() { helper.clickOnIdle('#SubScript'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p sub') .should('exist'); @@ -228,11 +225,13 @@ describe('Apply font changes.', function() { .should('not.exist'); }); - it('Apply style.', function() { + it('Apply style.', {retries : 0}, function() { + mobileHelper.closeMobileWizard(); + // Apply Title style applyStyle('Title'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p font') .should('have.attr', 'face', 'Liberation Sans, sans-serif'); @@ -242,7 +241,7 @@ describe('Apply font changes.', function() { // Clear formatting applyStyle('Clear formatting'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); 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 12eba314c5..2268f4ee78 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 writerMobileHelper = require('./writer_mobile_helper'); +var writerHelper = require('../../common/writer_helper'); describe('Apply paragraph properties.', function() { var testFileName = 'apply_paragraph_properties.odt'; @@ -10,11 +10,9 @@ describe('Apply paragraph properties.', function() { beforeEach(function() { helper.beforeAll(testFileName, 'writer'); - // Click on edit button mobileHelper.enableEditingMobile(); - // Do a selection - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); mobileHelper.openMobileWizard(); @@ -35,7 +33,9 @@ describe('Apply paragraph properties.', function() { it('Apply left/right alignment.', function() { helper.clickOnIdle('#RightPara'); - writerMobileHelper.selectAllMobile(); + mobileHelper.closeMobileWizard(); + + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'align', 'right'); @@ -53,7 +53,9 @@ describe('Apply paragraph properties.', function() { cy.get('#LeftParaimg') .should('have.class', 'selected'); - writerMobileHelper.selectAllMobile(); + mobileHelper.closeMobileWizard(); + + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'align', 'left'); @@ -62,7 +64,7 @@ describe('Apply paragraph properties.', function() { it('Apply center alignment.', function() { helper.clickOnIdle('#CenterPara'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'align', 'center'); @@ -71,7 +73,7 @@ describe('Apply paragraph properties.', function() { it('Apply justify alignment.', function() { helper.clickOnIdle('#JustifyPara'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'align', 'justify'); @@ -80,13 +82,14 @@ describe('Apply paragraph properties.', function() { it('Change writing direction.', function() { helper.clickOnIdle('#ParaRightToLeft'); - writerMobileHelper.selectAllMobile(); + mobileHelper.closeMobileWizard(); + + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'dir', 'rtl'); - // Select text - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); mobileHelper.openMobileWizard(); @@ -96,7 +99,9 @@ describe('Apply paragraph properties.', function() { // Change writing mode helper.clickOnIdle('#ParaLeftToRight'); - writerMobileHelper.selectAllMobile(); + mobileHelper.closeMobileWizard(); + + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('not.have.attr', 'dir'); @@ -105,7 +110,7 @@ describe('Apply paragraph properties.', function() { it('Apply default bulleting.', function() { helper.clickOnIdle('#DefaultBullet'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container ul li p') .should('exist'); @@ -114,7 +119,7 @@ describe('Apply paragraph properties.', function() { it('Apply default numbering.', function() { helper.clickOnIdle('#DefaultNumbering'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container ol li p') .should('exist'); @@ -125,7 +130,7 @@ describe('Apply paragraph properties.', function() { mobileHelper.selectFromColorPalette(2, 5, 2); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') @@ -138,7 +143,9 @@ describe('Apply paragraph properties.', function() { helper.clickOnIdle('#ParaspaceIncrease'); - writerMobileHelper.selectAllMobile(); + mobileHelper.closeMobileWizard(); + + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') @@ -148,8 +155,7 @@ describe('Apply paragraph properties.', function() { .should('have.attr', 'style') .should('contain', 'margin-bottom: 0.08in'); - // Select text - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); mobileHelper.openMobileWizard(); @@ -159,7 +165,7 @@ describe('Apply paragraph properties.', function() { // Decrease para spacing helper.clickOnIdle('#ParaspaceDecrease'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') @@ -202,7 +208,7 @@ describe('Apply paragraph properties.', function() { cy.get('#belowparaspacing .spinfield') .should('have.attr', 'value', '0.02'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') @@ -218,14 +224,15 @@ describe('Apply paragraph properties.', function() { helper.clickOnIdle('#IncrementIndent'); helper.clickOnIdle('#IncrementIndent'); - writerMobileHelper.selectAllMobile(); + mobileHelper.closeMobileWizard(); + + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') .should('contain', 'margin-left: 0.98in'); - // Select text - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); mobileHelper.openMobileWizard(); @@ -235,7 +242,7 @@ describe('Apply paragraph properties.', function() { // Decrease indent helper.clickOnIdle('#DecrementIndent'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') @@ -252,7 +259,7 @@ describe('Apply paragraph properties.', function() { cy.get('#beforetextindent .spinfield') .should('have.attr', 'value', '0.04'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') @@ -269,7 +276,7 @@ describe('Apply paragraph properties.', function() { cy.get('#aftertextindent .spinfield') .should('have.attr', 'value', '0.04'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') @@ -286,7 +293,7 @@ describe('Apply paragraph properties.', function() { cy.get('#firstlineindent .spinfield') .should('have.attr', 'value', '0.04'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); 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 def8002e18..8ef6b6fb25 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 writerMobileHelper = require('./writer_mobile_helper'); +var writerHelper = require('../../common/writer_helper'); describe('Pushing bottom toolbar items.', function() { var testFileName = 'bottom_toolbar.odt'; @@ -10,11 +10,9 @@ describe('Pushing bottom toolbar items.', function() { beforeEach(function() { helper.beforeAll(testFileName, 'writer'); - // Click on edit button mobileHelper.enableEditingMobile(); - // Do a new selection - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); }); afterEach(function() { @@ -31,7 +29,7 @@ describe('Pushing bottom toolbar items.', function() { cy.get('#tb_editbar_item_bold div table') .should('have.class', 'checked'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p b') .should('exist'); @@ -47,7 +45,7 @@ describe('Pushing bottom toolbar items.', function() { cy.get('#tb_editbar_item_italic div table') .should('have.class', 'checked'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p i') .should('exist'); @@ -62,7 +60,7 @@ describe('Pushing bottom toolbar items.', function() { cy.get('#tb_editbar_item_underline div table') .should('have.class', 'checked'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p u') .should('exist'); @@ -78,7 +76,7 @@ describe('Pushing bottom toolbar items.', function() { cy.get('#tb_editbar_item_strikeout div table') .should('have.class', 'checked'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p strike') .should('exist'); @@ -93,7 +91,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;'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p font') .should('have.attr', 'color', '#0000ff'); @@ -108,7 +106,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;'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p font span') .should('have.attr', 'style', 'background: #ff00ff'); @@ -124,7 +122,7 @@ describe('Pushing bottom toolbar items.', function() { cy.get('#tb_editbar_item_rightpara div table') .should('have.class', 'checked'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'align', 'right'); @@ -138,7 +136,7 @@ describe('Pushing bottom toolbar items.', function() { cy.get('#tb_editbar_item_leftpara div table') .should('have.class', 'checked'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'align', 'left'); @@ -154,7 +152,7 @@ describe('Pushing bottom toolbar items.', function() { cy.get('#tb_editbar_item_centerpara div table') .should('have.class', 'checked'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'align', 'center'); @@ -170,7 +168,7 @@ describe('Pushing bottom toolbar items.', function() { cy.get('#tb_editbar_item_justifypara div table') .should('have.class', 'checked'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'align', 'justify'); @@ -186,7 +184,7 @@ describe('Pushing bottom toolbar items.', function() { cy.get('#tb_editbar_item_defaultnumbering div table') .should('have.class', 'checked'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container ol li p') .should('exist'); @@ -202,7 +200,7 @@ describe('Pushing bottom toolbar items.', function() { cy.get('#tb_editbar_item_defaultbullet div table') .should('have.class', 'checked'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container ul li p') .should('exist'); @@ -212,7 +210,7 @@ describe('Pushing bottom toolbar items.', function() { cy.get('#tb_editbar_item_incrementindent') .click().click(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') @@ -221,7 +219,7 @@ describe('Pushing bottom toolbar items.', function() { cy.get('#tb_editbar_item_decrementindent') .click(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'style') 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 9eea04c0cc..de708572e1 100644 --- a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js +++ b/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js @@ -2,7 +2,7 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); -var writerMobileHelper = require('./writer_mobile_helper'); +var writerHelper = require('../../common/writer_helper'); describe('Trigger hamburger menu options.', function() { var testFileName = 'hamburger_menu.odt'; @@ -20,7 +20,7 @@ describe('Trigger hamburger menu options.', function() { function hideText() { // Change text color to white to hide text. - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); mobileHelper.openMobileWizard(); @@ -52,11 +52,11 @@ describe('Trigger hamburger menu options.', function() { it('Save', function() { // Change the document content and save it - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); helper.typeIntoDocument('new'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); helper.expectTextForClipboard('\nnew'); @@ -67,7 +67,7 @@ describe('Trigger hamburger menu options.', function() { mobileHelper.enableEditingMobile(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); helper.expectTextForClipboard('\nnew'); }); @@ -136,7 +136,7 @@ describe('Trigger hamburger menu options.', function() { // Type a new character helper.typeIntoDocument('q'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('contain.text', 'q'); @@ -144,7 +144,7 @@ describe('Trigger hamburger menu options.', function() { // Undo mobileHelper.selectHamburgerMenuItem(['Edit', 'Undo']); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('not.contain.text', 'q'); @@ -152,7 +152,7 @@ describe('Trigger hamburger menu options.', function() { // Redo mobileHelper.selectHamburgerMenuItem(['Edit', 'Redo']); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('contain.text', 'q'); @@ -165,7 +165,7 @@ describe('Trigger hamburger menu options.', function() { // Second change helper.typeIntoDocument('w'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('contain.text', 'qw'); @@ -173,7 +173,7 @@ describe('Trigger hamburger menu options.', function() { // Undo mobileHelper.selectHamburgerMenuItem(['Edit', 'Undo']); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('not.contain.text', 'w'); @@ -196,7 +196,7 @@ describe('Trigger hamburger menu options.', function() { cy.get('.leaflet-popup-content input[value=\'Jump to state\']') .click(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('contain.text', 'qw'); @@ -219,7 +219,7 @@ describe('Trigger hamburger menu options.', function() { cy.get('.leaflet-popup-content input[value=\'Jump to state\']') .click(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('not.contain.text', 'q'); @@ -229,7 +229,7 @@ describe('Trigger hamburger menu options.', function() { }); it('Cut.', function() { - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); mobileHelper.selectHamburgerMenuItem(['Edit', 'Cut']); @@ -249,7 +249,7 @@ describe('Trigger hamburger menu options.', function() { }); it('Copy.', function() { - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); mobileHelper.selectHamburgerMenuItem(['Edit', 'Copy']); @@ -269,7 +269,7 @@ describe('Trigger hamburger menu options.', function() { }); it('Paste.', function() { - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); mobileHelper.selectHamburgerMenuItem(['Edit', 'Paste']); @@ -341,7 +341,7 @@ describe('Trigger hamburger menu options.', function() { helper.clearAllText(); // By default track changed are shown. - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); // We have selection markers. cy.get('.leaflet-marker-icon') @@ -412,7 +412,7 @@ describe('Trigger hamburger menu options.', function() { helper.clearAllText(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); // We don't have actual text content. cy.get('#copy-paste-container p') @@ -421,7 +421,7 @@ describe('Trigger hamburger menu options.', function() { // Reject removal. mobileHelper.selectHamburgerMenuItem(['Track Changes', 'Reject All']); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); // We get back the content. cy.contains('#copy-paste-container p', 'xxxxxxx') @@ -483,7 +483,7 @@ describe('Trigger hamburger menu options.', function() { }); it('Check word counts.', function() { - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); mobileHelper.selectHamburgerMenuItem(['Word Count...']); 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 01e0cd821c..bcf7f6bad4 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 writerMobileHelper = require('./writer_mobile_helper'); +var writerHelper = require('../../common/writer_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(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); 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(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); 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(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p span sdfield') .should('have.attr', 'type', 'DATETIME'); @@ -72,7 +72,7 @@ describe('Insert fields via insertion wizard.', function() { cy.contains('.menu-entry-with-icon', 'Time') .click(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p span sdfield') .should('have.attr', 'type', 'DATETIME'); @@ -88,7 +88,7 @@ describe('Insert fields via insertion wizard.', function() { cy.contains('.menu-entry-with-icon', 'Title') .click(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p span sdfield') .should('have.attr', 'type', 'DOCINFO') @@ -100,7 +100,7 @@ describe('Insert fields via insertion wizard.', function() { cy.contains('.menu-entry-with-icon', 'First Author') .click(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p span sdfield') .should('have.attr', 'type', 'DOCINFO') @@ -113,7 +113,7 @@ describe('Insert fields via insertion wizard.', function() { cy.contains('.menu-entry-with-icon', 'Subject') .click(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); 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 5df37b095e..6a8d1131e9 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 writerMobileHelper = require('./writer_mobile_helper'); +var writerHelper = require('../../common/writer_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(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); 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(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); 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(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); 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(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); 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(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); 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(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); 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(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); 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 111e7ec9ef..99878598dd 100644 --- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js +++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js @@ -4,7 +4,7 @@ require('cypress-file-upload'); var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); -var writerMobileHelper = require('./writer_mobile_helper'); +var writerHelper = require('../../common/writer_helper'); describe('Insert objects via insertion wizard.', function() { var testFileName = 'insert_object.odt'; @@ -77,7 +77,7 @@ describe('Insert objects via insertion wizard.', function() { cy.get('.leaflet-marker-icon.table-column-resize-marker') .should('exist'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); // Two rows cy.get('#copy-paste-container tr') @@ -111,7 +111,7 @@ describe('Insert objects via insertion wizard.', function() { cy.get('.leaflet-marker-icon.table-column-resize-marker') .should('exist'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); // Three rows cy.get('#copy-paste-container tr') @@ -295,7 +295,7 @@ describe('Insert objects via insertion wizard.', function() { cy.get('.vex-content.hyperlink-dialog .vex-dialog-button-primary') .click(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.text', '\nsome text'); diff --git a/cypress_test/integration_tests/mobile/writer/nextcloud_spec.js b/cypress_test/integration_tests/mobile/writer/nextcloud_spec.js index c0c19e5da1..db49b13e4a 100644 --- a/cypress_test/integration_tests/mobile/writer/nextcloud_spec.js +++ b/cypress_test/integration_tests/mobile/writer/nextcloud_spec.js @@ -3,7 +3,7 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); var nextcloudHelper = require('../../common/nextcloud_helper'); -var writerMobileHelper = require('./writer_mobile_helper'); +var writerHelper = require('../../common/writer_helper'); describe('Nextcloud specific tests.', function() { var testFileName = 'nextcloud.odt'; @@ -72,14 +72,14 @@ describe('Nextcloud specific tests.', function() { mobileHelper.enableEditingMobile(); // Initially we have "text" text in the document - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); helper.expectTextForClipboard('text'); // Change the document content and save it helper.typeIntoDocument('new'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); helper.expectTextForClipboard('new'); @@ -89,7 +89,7 @@ describe('Nextcloud specific tests.', function() { mobileHelper.enableEditingMobile(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); helper.expectTextForClipboard('text'); }); diff --git a/cypress_test/integration_tests/mobile/writer/searchbar_spec.js b/cypress_test/integration_tests/mobile/writer/searchbar_spec.js index c8f9d09d70..67d845f9cf 100644 --- a/cypress_test/integration_tests/mobile/writer/searchbar_spec.js +++ b/cypress_test/integration_tests/mobile/writer/searchbar_spec.js @@ -3,7 +3,7 @@ var helper = require('../../common/helper'); var searchHelper = require('../../common/search_helper'); var mobileHelper = require('../../common/mobile_helper'); -var writerMobileHelper = require('./writer_mobile_helper'); +var writerHelper = require('../../common/writer_helper'); describe('Searching via search bar.', function() { var testFileName = 'search_bar.odt'; @@ -32,7 +32,7 @@ describe('Searching via search bar.', function() { }); it('Search not existing word.', function() { - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); cy.get('.leaflet-marker-icon') .should('exist'); diff --git a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js index 2ccd5baa0c..4068df911e 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 writerMobileHelper = require('./writer_mobile_helper'); +var writerHelper = require('../../common/writer_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 - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); // Open context menu cy.get('.leaflet-marker-icon') @@ -54,7 +54,7 @@ describe('Spell checking menu.', function() { cy.contains('.context-menu-link', 'hello') .click(); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); 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 0700023560..e4aca7b377 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 writerMobileHelper = require('./writer_mobile_helper'); +var writerHelper = require('../../common/writer_helper'); describe('Change table properties / layout via mobile wizard.', function() { var testFileName = ''; @@ -31,7 +31,7 @@ describe('Change table properties / layout via mobile wizard.', function() { function selectFullTable() { helper.typeIntoDocument('{downarrow}{downarrow}{downarrow}{downarrow}'); - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); } it('Insert row before.', function() { @@ -182,8 +182,7 @@ describe('Change table properties / layout via mobile wizard.', function() { mobileHelper.closeMobileWizard(); - // Do a new selection - writerMobileHelper.selectAllMobile(); + writerHelper.selectAllTextOfDoc(); // Check markers are in the same row (we have text selection only) cy.get('.leaflet-marker-icon') diff --git a/cypress_test/integration_tests/mobile/writer/writer_mobile_helper.js b/cypress_test/integration_tests/mobile/writer/writer_mobile_helper.js deleted file mode 100644 index ea878c5ee4..0000000000 --- a/cypress_test/integration_tests/mobile/writer/writer_mobile_helper.js +++ /dev/null @@ -1,22 +0,0 @@ -/* global cy require*/ - -var helper = require('../../common/helper'); -var mobileHelper = require('../../common/mobile_helper'); - -function selectAllMobile() { - cy.log('Select all via hamburger menu - start.'); - - // Remove selection if exist - helper.typeIntoDocument('{downarrow}'); - cy.get('.leaflet-selection-marker-start') - .should('not.exist'); - - mobileHelper.selectHamburgerMenuItem(['Edit', 'Select All']); - - cy.get('.leaflet-marker-icon') - .should('exist'); - - cy.log('Select all via hamburger menu - end.'); -} - -module.exports.selectAllMobile = selectAllMobile; diff --git a/cypress_test/integration_tests/multiuser/writer/top_toolbar_interfer_user1_spec.js b/cypress_test/integration_tests/multiuser/writer/top_toolbar_interfer_user1_spec.js index 47de83edd4..9b8834e3e4 100644 --- a/cypress_test/integration_tests/multiuser/writer/top_toolbar_interfer_user1_spec.js +++ b/cypress_test/integration_tests/multiuser/writer/top_toolbar_interfer_user1_spec.js @@ -1,6 +1,7 @@ /* global describe it cy beforeEach require afterEach Cypress */ var helper = require('../../common/helper'); +var writerHelper = require('../../common/writer_helper'); describe('Top toolbar interfering test: user-1.', function() { var testFileName = 'top_toolbar_interfer.odt'; @@ -13,7 +14,7 @@ describe('Top toolbar interfering test: user-1.', function() { cy.wait(2000); - helper.selectAllText(false); + writerHelper.selectAllTextOfDoc(); }); afterEach(function() { @@ -24,7 +25,7 @@ describe('Top toolbar interfering test: user-1.', function() { cy.get('#tb_editbar_item_bold') .click(); - helper.selectAllText(false); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p b') .should('exist'); @@ -34,7 +35,7 @@ describe('Top toolbar interfering test: user-1.', function() { cy.get('#tb_editbar_item_italic') .click(); - helper.selectAllText(false); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p i') .should('exist'); @@ -43,7 +44,7 @@ describe('Top toolbar interfering test: user-1.', function() { it('Apply underline.', function() { cy.get('#tb_editbar_item_underline') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p u') .should('exist'); @@ -53,7 +54,7 @@ describe('Top toolbar interfering test: user-1.', function() { cy.get('#tb_editbar_item_strikeout') .click(); - helper.reselectAllText(); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p strike') .should('exist'); @@ -63,7 +64,7 @@ describe('Top toolbar interfering test: user-1.', function() { cy.get('#tb_editbar_item_centerpara') .click(); - helper.selectAllText(false); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'align', 'center'); @@ -71,7 +72,7 @@ describe('Top toolbar interfering test: user-1.', function() { cy.get('#tb_editbar_item_leftpara') .click(); - helper.selectAllText(false); + writerHelper.selectAllTextOfDoc(); cy.get('#copy-paste-container p') .should('have.attr', 'align', 'left'); |