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

Ashod Nakashian (via logerrit) logerrit at kemper.freedesktop.org
Wed Mar 18 09:14:49 UTC 2020 

 cypress_test/integration_tests/mobile/calc/apply_font_spec.js                   |    2 -
 cypress_test/integration_tests/mobile/calc/calc_helper.js                       |    8 -----
 cypress_test/integration_tests/mobile/calc/focus_spec.js                        |    4 +-
 cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js             |    2 -
 cypress_test/integration_tests/mobile/writer/apply_font_spec.js                 |    2 -
 cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js |    2 -
 cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js             |    2 -
 cypress_test/integration_tests/mobile/writer/focus_spec.js                      |   16 +++++-----
 cypress_test/integration_tests/mobile/writer/insert_field_spec.js               |    2 -
 cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js     |    2 -
 cypress_test/integration_tests/mobile/writer/insert_object_spec.js              |    2 -
 cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js        |    6 +--
 cypress_test/integration_tests/mobile/writer/shape_properties_spec.js           |    2 -
 cypress_test/integration_tests/mobile/writer/spellchecking_spec.js              |    2 -
 cypress_test/integration_tests/mobile/writer/table_properties_spec.js           |    2 -
 cypress_test/integration_tests/mobile/writer/toolbar_spec.js                    |   16 +++++-----
 16 files changed, 33 insertions(+), 39 deletions(-)

New commits:
commit 4ff5406701fa30b264b23d687c7b83e80e1781d5
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Mon Mar 16 14:58:32 2020 -0400
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Wed Mar 18 10:14:31 2020 +0100

    cypress: reuse helper to enable editing in tests
    
    Change-Id: I9565376bf3e34c2d95a14a5411cee732a77f9f0a
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90647
    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/mobile/calc/apply_font_spec.js b/cypress_test/integration_tests/mobile/calc/apply_font_spec.js
index 01ddbf8a6..2a669f70a 100644
--- a/cypress_test/integration_tests/mobile/calc/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/apply_font_spec.js
@@ -8,7 +8,7 @@ describe('Apply font changes.', function() {
 		helper.beforeAllMobile('apply_font.ods', 'calc');
 
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Button should be enabled now
 		cy.get('#tb_actionbar_item_mobile_wizard')
diff --git a/cypress_test/integration_tests/mobile/calc/calc_helper.js b/cypress_test/integration_tests/mobile/calc/calc_helper.js
index 2b9ee7c04..5a796cc4d 100644
--- a/cypress_test/integration_tests/mobile/calc/calc_helper.js
+++ b/cypress_test/integration_tests/mobile/calc/calc_helper.js
@@ -4,13 +4,7 @@ var helper = require('../../common/helper');
 
 function clickOnFirstCell() {
 	// Enable editing if it's in read-only mode
-	cy.get('#mobile-edit-button')
-		.then(function(button) {
-			if (button.css('display') !== 'none') {
-				cy.get('#mobile-edit-button')
-					.click();
-			}
-		});
+	helper.enableEditingMobile();
 
 	// Use the tile's edge to find the first cell's position
 	cy.get('.leaflet-tile-container')
diff --git a/cypress_test/integration_tests/mobile/calc/focus_spec.js b/cypress_test/integration_tests/mobile/calc/focus_spec.js
index 49668d5ce..2c23bc1a5 100644
--- a/cypress_test/integration_tests/mobile/calc/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/focus_spec.js
@@ -14,7 +14,7 @@ describe('Calc focus tests', function() {
 
 	it('Basic document focus.', function() {
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		cy.get('#tb_actionbar_item_mobile_wizard')
 			.should('not.have.class', 'disabled');
@@ -50,7 +50,7 @@ describe('Calc focus tests', function() {
 
 	it.skip('Focus on second tap.', function() {
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		cy.get('#tb_actionbar_item_mobile_wizard')
 			.should('not.have.class', 'disabled');
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 c94471133..1b5d1637a 100644
--- a/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
@@ -8,7 +8,7 @@ describe('Calc insertion wizard.', function() {
 		helper.beforeAllMobile('insertion_wizard.ods', 'calc');
 
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Button should be enabled now
 		cy.get('#tb_actionbar_item_insertion_mobile_wizard')
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 063667b3a..08e51940c 100644
--- a/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
@@ -8,7 +8,7 @@ describe('Apply font changes.', function() {
 		helper.beforeAllMobile('apply_font.odt', 'writer');
 
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Do a new selection
 		writerHelper.selectAllMobile();
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 1cf964571..7db827bbf 100644
--- a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
@@ -8,7 +8,7 @@ describe('Apply paragraph properties.', function() {
 		helper.beforeAllMobile('apply_paragraph_properties.odt', 'writer');
 
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Do a selection
 		writerHelper.selectAllMobile();
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 e9dfd0ebf..edc05ca95 100644
--- a/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js
@@ -8,7 +8,7 @@ describe('Pushing bottom toolbar items.', function() {
 		helper.beforeAllMobile('bottom_toolbar.odt', 'writer');
 
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Do a new selection
 		writerHelper.selectAllMobile();
diff --git a/cypress_test/integration_tests/mobile/writer/focus_spec.js b/cypress_test/integration_tests/mobile/writer/focus_spec.js
index a0c385fc9..4e4d50b6d 100644
--- a/cypress_test/integration_tests/mobile/writer/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/focus_spec.js
@@ -13,7 +13,7 @@ describe('Focus tests', function() {
 
 	it('Basic document focus.', function() {
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		cy.get('#tb_actionbar_item_mobile_wizard')
 			.should('not.have.class', 'disabled');
@@ -33,7 +33,7 @@ describe('Focus tests', function() {
 
 	it('Focus with a vex dialog.', function() {
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Open comment insertion dialog
 		cy.get('#tb_actionbar_item_insertcomment')
@@ -58,7 +58,7 @@ describe('Focus tests', function() {
 
 	it('Focus with opened mobile wizard.', function() {
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Click in the document
 		cy.get('#document-container')
@@ -91,7 +91,7 @@ describe('Focus tests', function() {
 
 	it('Focus inside mobile wizard.', function() {
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Open mobile wizard
 		cy.get('#tb_actionbar_item_mobile_wizard')
@@ -124,7 +124,7 @@ describe('Focus tests', function() {
 
 	it('Focus after insertion.', function() {
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Open insertion mobile wizard
 		cy.get('#tb_actionbar_item_insertion_mobile_wizard')
@@ -153,7 +153,7 @@ describe('Focus tests', function() {
 
 	it('Shape related focus.', function() {
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Open insertion mobile wizard
 		cy.get('#tb_actionbar_item_insertion_mobile_wizard')
@@ -209,7 +209,7 @@ describe('Focus tests', function() {
 
 	it('Focus with hamburger menu.', function() {
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Click in the document
 		cy.get('#document-container')
@@ -238,7 +238,7 @@ describe('Focus tests', function() {
 
 	it('Focus after applying font change.', function() {
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Click in the document
 		cy.get('#document-container')
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 6bb593911..541015653 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
@@ -8,7 +8,7 @@ describe('Insert fields via insertion wizard.', function() {
 		helper.beforeAllMobile('insert_field.odt', 'writer');
 
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Open insertion wizard
 		cy.get('#tb_actionbar_item_insertion_mobile_wizard')
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 fea6f572e..1133eb2cd 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
@@ -8,7 +8,7 @@ describe('Insert formatting mark via insertion wizard.', function() {
 		helper.beforeAllMobile('insert_formatting_mark.odt', 'writer');
 
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Open insertion wizard
 		cy.get('#tb_actionbar_item_insertion_mobile_wizard')
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 df96973a3..7a01c8824 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
@@ -8,7 +8,7 @@ describe('Insert objects via insertion wizard.', function() {
 		helper.beforeAllMobile('insert_object.odt', 'writer');
 
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 	});
 
 	afterEach(function() {
diff --git a/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js b/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js
index b9bec57e7..be154ccf2 100644
--- a/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js
@@ -13,7 +13,7 @@ describe('Mobile wizard state tests', function() {
 
 	it('Open and close mobile wizard by toolbar item.', function() {
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Click on mobile wizard toolbar item
 		cy.get('#tb_actionbar_item_mobile_wizard')
@@ -53,7 +53,7 @@ describe('Mobile wizard state tests', function() {
 
 	it('Close mobile wizard by hamburger menu.', function() {
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Click on mobile wizard toolbar item
 		cy.get('#tb_actionbar_item_mobile_wizard')
@@ -89,7 +89,7 @@ describe('Mobile wizard state tests', function() {
 
 	it('Close mobile wizard by context wizard.', function() {
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Click on mobile wizard toolbar item
 		cy.get('#tb_actionbar_item_mobile_wizard')
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 149e098b8..2fcf6f6cf 100644
--- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
@@ -10,7 +10,7 @@ describe('Change shape properties via mobile wizard.', function() {
 		helper.beforeAllMobile('shape_properties.odt', 'writer');
 
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		writerHelper.selectAllMobile();
 
diff --git a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
index 6cb9caf68..6bd70282d 100644
--- a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
@@ -8,7 +8,7 @@ describe('Spell checking menu.', function() {
 		helper.beforeAllMobile('spellchecking.odt', 'writer');
 
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 	});
 
 	afterEach(function() {
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 45135807b..8bc9b0d6d 100644
--- a/cypress_test/integration_tests/mobile/writer/table_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/table_properties_spec.js
@@ -16,7 +16,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		helper.loadTestDoc(testFile, 'writer', true);
 
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Open insertion wizard
 		cy.get('#tb_actionbar_item_mobile_wizard')
diff --git a/cypress_test/integration_tests/mobile/writer/toolbar_spec.js b/cypress_test/integration_tests/mobile/writer/toolbar_spec.js
index a24e821e4..b9b804813 100644
--- a/cypress_test/integration_tests/mobile/writer/toolbar_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/toolbar_spec.js
@@ -17,7 +17,7 @@ describe('Toolbar tests', function() {
 			.should('have.class', 'disabled');
 
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Button should be enabled now
 		cy.get('#tb_actionbar_item_mobile_wizard')
@@ -30,7 +30,7 @@ describe('Toolbar tests', function() {
 			.should('have.class', 'disabled');
 
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Button should be enabled now
 		cy.get('#tb_actionbar_item_insertion_mobile_wizard')
@@ -43,7 +43,7 @@ describe('Toolbar tests', function() {
 			.should('have.class', 'disabled');
 
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Button should be enabled now
 		cy.get('#tb_actionbar_item_insertcomment')
@@ -56,7 +56,7 @@ describe('Toolbar tests', function() {
 			.should('have.class', 'disabled');
 
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Button should be still disabled
 		cy.get('#tb_actionbar_item_undo')
@@ -76,7 +76,7 @@ describe('Toolbar tests', function() {
 			.should('have.class', 'disabled');
 
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Button should be still disabled
 		cy.get('#tb_actionbar_item_redo')
@@ -101,7 +101,7 @@ describe('Toolbar tests', function() {
 
 	it('Open and close mobile wizard by toolbar item.', function() {
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Click on mobile wizard toolbar item
 		cy.get('#tb_actionbar_item_mobile_wizard')
@@ -128,7 +128,7 @@ describe('Toolbar tests', function() {
 
 	it('Open and close insertion mobile wizard by toolbar item.', function() {
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Click on toolbar item
 		cy.get('#tb_actionbar_item_insertion_mobile_wizard')
@@ -164,7 +164,7 @@ describe('Toolbar tests', function() {
 
 	it('Open insert comment dialog by toolbar item.', function() {
 		// Click on edit button
-		cy.get('#mobile-edit-button').click();
+		helper.enableEditingMobile();
 
 		// Click on toolbar item
 		cy.get('#tb_actionbar_item_insertcomment')

More information about the Libreoffice-commits mailing list