cypress_test/Makefile.am | 4 - cypress_test/cypress.json | 3 - cypress_test/integration_tests/mobile/calc/calc_helper.js | 3 + 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 | 24 ++++++++++ cypress_test/integration_tests/mobile/writer/shape_properties_spec.js | 2 cypress_test/integration_tests/mobile/writer/writer_helper.js | 15 +++++- 8 files changed, 50 insertions(+), 5 deletions(-)
New commits: commit fd1dee501d0d15b14a844017f1a553d86278d39d Author: Tamás Zolnai <[email protected]> AuthorDate: Thu Mar 12 11:21:07 2020 +0100 Commit: Tamás Zolnai <[email protected]> CommitDate: Thu Mar 12 12:07:03 2020 +0100 cypress: disable supportFile option. Parallel build sometimes fails because of missing supportFile. We don't actually use the supportFile. An empty support file is generated by the framework. Change-Id: I09d79678638ae9776e1568bff5f9267623d966f4 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90374 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tamás Zolnai <[email protected]> diff --git a/cypress_test/cypress.json b/cypress_test/cypress.json index 2ba462732..a85b1ce92 100644 --- a/cypress_test/cypress.json +++ b/cypress_test/cypress.json @@ -2,5 +2,6 @@ "integrationFolder" : "integration_tests", "video" : false, "pluginsFile" : "plugins/index.js", - "defaultCommandTimeout" : 6000 + "defaultCommandTimeout" : 6000, + "supportFile" : false } commit d0fe43bffa8a8e158782d6b5b58ce9097c51011a Author: Tamás Zolnai <[email protected]> AuthorDate: Thu Mar 12 01:42:06 2020 +0100 Commit: Tamás Zolnai <[email protected]> CommitDate: Thu Mar 12 12:06:55 2020 +0100 cypress: catch also AssertionError. Change-Id: I78a5d0f5a160a68197019735565689f61a5cdb39 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90372 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tamás Zolnai <[email protected]> diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index f80fdcf39..84470784e 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -60,7 +60,7 @@ DESKTOP_TEST_FILES_DONE= \ $(foreach test_file,$(DEKSTOP_TEST_FILES),$(DESKTOP_TRACK_FOLDER)/$(test_file).done) check-local: do-check - $(if $(wildcard $(ERROR_LOG)),$(error Cypress test failure!)) + $(if $(wildcard $(ERROR_LOG)),$(error CypressError: some tests failed!)) do-check: $(DESKTOP_TEST_FILES_DONE) $(MOBILE_TEST_FILES_DONE) @$(KILL_COMMAND) || true @@ -197,7 +197,7 @@ endef define execute_run_parallel @mkdir -p $(dir $(2)) && touch $(2) && \ echo "`echo $(1) && $(1)`" > $(2) 2>&1 && \ - if [ -z `grep -o -m 1 "CypressError" $(2)` ];\ + if [ -z `grep -o -m 1 "CypressError\|AssertionError" $(2)` ];\ then cat $(2);\ else cat $(2) >> $(ERROR_LOG);\ fi; commit f1a75a2d30bfe33820d499c76d1929f7283806e5 Author: Tamás Zolnai <[email protected]> AuthorDate: Thu Mar 12 01:20:11 2020 +0100 Commit: Tamás Zolnai <[email protected]> CommitDate: Thu Mar 12 12:06:49 2020 +0100 cypress: mobile: use mobile wizard indicator before useing contains(). Change-Id: I9565b6f14dc00d21bf0a446af8e554843bc511bc Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90371 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tamás Zolnai <[email protected]> diff --git a/cypress_test/integration_tests/mobile/calc/calc_helper.js b/cypress_test/integration_tests/mobile/calc/calc_helper.js index 7bbec9781..2b9ee7c04 100644 --- a/cypress_test/integration_tests/mobile/calc/calc_helper.js +++ b/cypress_test/integration_tests/mobile/calc/calc_helper.js @@ -34,6 +34,9 @@ function copyContentToClipboard() { helper.longPressOnDocument(XPos, YPos); }); + cy.get('#mobile-wizard') + .should('be.visible'); + // Execute copy cy.get('.menu-entry-with-icon', {timeout : 10000}) .contains('Copy') 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 05335ac92..9db700b3d 100644 --- a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js +++ b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js @@ -14,6 +14,8 @@ describe('Insert fields via insertion wizard.', function() { cy.get('#tb_actionbar_item_insertion_mobile_wizard') .should('not.have.class', 'disabled') .click(); + cy.get('#mobile-wizard') + .should('be.visible'); // Open fields submenu cy.get('.menu-entry-with-icon.flex-fullwidth') 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 5154a4b90..b4b63c6fe 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 @@ -14,6 +14,8 @@ describe('Insert formatting mark via insertion wizard.', function() { cy.get('#tb_actionbar_item_insertion_mobile_wizard') .should('not.have.class', 'disabled') .click(); + cy.get('#mobile-wizard') + .should('be.visible'); // Open formatting marks cy.get('.menu-entry-with-icon.flex-fullwidth') 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 0604d992f..37b3ebec7 100644 --- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js +++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js @@ -19,6 +19,8 @@ describe('Insert objects via insertion wizard.', function() { // Open insertion wizard cy.get('#tb_actionbar_item_insertion_mobile_wizard') .click(); + cy.get('#mobile-wizard') + .should('be.visible'); // We check whether the entry is there cy.get('.menu-entry-with-icon') @@ -30,6 +32,8 @@ describe('Insert objects via insertion wizard.', function() { // Open insertion wizard cy.get('#tb_actionbar_item_insertion_mobile_wizard') .click(); + cy.get('#mobile-wizard') + .should('be.visible'); cy.get('.menu-entry-with-icon') .contains('Comment') @@ -61,6 +65,8 @@ describe('Insert objects via insertion wizard.', function() { // Open insertion wizard cy.get('#tb_actionbar_item_insertion_mobile_wizard') .click(); + cy.get('#mobile-wizard') + .should('be.visible'); // Open Table submenu cy.get('.ui-header.level-0.mobile-wizard.ui-widget') @@ -96,6 +102,8 @@ describe('Insert objects via insertion wizard.', function() { // Open insertion wizard cy.get('#tb_actionbar_item_insertion_mobile_wizard') .click(); + cy.get('#mobile-wizard') + .should('be.visible'); // Open Table submenu cy.get('.ui-header.level-0.mobile-wizard.ui-widget') @@ -143,6 +151,8 @@ describe('Insert objects via insertion wizard.', function() { // Open insertion wizard cy.get('#tb_actionbar_item_insertion_mobile_wizard') .click(); + cy.get('#mobile-wizard') + .should('be.visible'); // Open header/footer submenu cy.get('.menu-entry-with-icon') @@ -184,6 +194,8 @@ describe('Insert objects via insertion wizard.', function() { // Open insertion wizard cy.get('#tb_actionbar_item_insertion_mobile_wizard') .click(); + cy.get('#mobile-wizard') + .should('be.visible'); // Open header/footer submenu cy.get('.menu-entry-with-icon') @@ -225,6 +237,8 @@ describe('Insert objects via insertion wizard.', function() { // Open insertion wizard cy.get('#tb_actionbar_item_insertion_mobile_wizard') .click(); + cy.get('#mobile-wizard') + .should('be.visible'); // Insert footnote cy.get('.menu-entry-with-icon') @@ -254,6 +268,8 @@ describe('Insert objects via insertion wizard.', function() { // Open insertion wizard cy.get('#tb_actionbar_item_insertion_mobile_wizard') .click(); + cy.get('#mobile-wizard') + .should('be.visible'); // Insert endnote cy.get('.menu-entry-with-icon') @@ -283,6 +299,8 @@ describe('Insert objects via insertion wizard.', function() { // Open insertion wizard cy.get('#tb_actionbar_item_insertion_mobile_wizard') .click(); + cy.get('#mobile-wizard') + .should('be.visible'); // Insert endnote cy.get('.menu-entry-with-icon') @@ -312,6 +330,8 @@ describe('Insert objects via insertion wizard.', function() { // Open insertion wizard cy.get('#tb_actionbar_item_insertion_mobile_wizard') .click(); + cy.get('#mobile-wizard') + .should('be.visible'); // Do insertion cy.get('.menu-entry-with-icon') @@ -332,6 +352,8 @@ describe('Insert objects via insertion wizard.', function() { // Open insertion wizard cy.get('#tb_actionbar_item_insertion_mobile_wizard') .click(); + cy.get('#mobile-wizard') + .should('be.visible'); // Open hyperlink dialog cy.get('.menu-entry-with-icon') @@ -365,6 +387,8 @@ describe('Insert objects via insertion wizard.', function() { // Open insertion wizard cy.get('#tb_actionbar_item_insertion_mobile_wizard') .click(); + cy.get('#mobile-wizard') + .should('be.visible'); // Do insertion cy.get('.menu-entry-with-icon') 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 7802c939a..84dfdae51 100644 --- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js +++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js @@ -15,6 +15,8 @@ describe('Change shape properties via mobile wizard.', function() { // Open insertion wizard cy.get('#tb_actionbar_item_insertion_mobile_wizard') .click(); + cy.get('#mobile-wizard') + .should('be.visible'); // Do insertion cy.get('.menu-entry-with-icon') diff --git a/cypress_test/integration_tests/mobile/writer/writer_helper.js b/cypress_test/integration_tests/mobile/writer/writer_helper.js index a233869c9..88b591270 100644 --- a/cypress_test/integration_tests/mobile/writer/writer_helper.js +++ b/cypress_test/integration_tests/mobile/writer/writer_helper.js @@ -15,6 +15,9 @@ function copyTextToClipboard() { helper.longPressOnDocument(XPos, YPos); }); + cy.get('#mobile-wizard') + .should('be.visible'); + // Execute copy cy.get('.ui-header.level-0.mobile-wizard.ui-widget .context-menu-link .menu-entry-with-icon', {timeout : 10000}) .contains('Copy') @@ -50,6 +53,9 @@ function copyTableToClipboard() { helper.longPressOnDocument(XPos, YPos); }); + cy.get('#mobile-wizard') + .should('be.visible'); + // Execute copy cy.get('.ui-header.level-0.mobile-wizard.ui-widget .context-menu-link .menu-entry-with-icon') .contains('Copy') @@ -77,8 +83,11 @@ function clearMobileWizardState() { cy.get('#toolbar-hamburger') .click(); - cy.get('.menu-entry-with-icon', {timeout: 10000}) - .contains('About'); + cy.get('#mobile-wizard-content') + .should('be.visible'); + + cy.get('.menu-entry-with-icon') + .contains('About', {timeout: 10000}); // Close hamburger menu cy.get('#toolbar-hamburger') @@ -103,6 +112,8 @@ function selectAllMobile() { // Open hamburger menu cy.get('#toolbar-hamburger') .click(); + cy.get('#mobile-wizard') + .should('be.visible', {timeout : 10000}); // Open edit menu cy.get('.ui-header.level-0 .menu-entry-with-icon') _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
