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

[Tamás Zolnai (via logerrit)]

 cypress_test/Makefile.am                                            |    4 +--
 cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js |   12 +++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 725fa229e4cacd8f1ddeebf910e04559eba80678
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Jun 15 12:42:45 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon Jun 15 14:44:10 2020 +0200

    cypress: improve error log.
    
    Change-Id: I5b91553af3f7fee5233c779fd2abd597af10fb02
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96328
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 23878852a..a4bf5ae4a 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -237,9 +237,9 @@ define error_output_string
 "\n\
 CypressError: a test failed, please do one of the following:\n\n\
 Run the failing test in headless mode:\n\
-\tmake check-$(1) spec=$(2)\n\n\
+\tcd cypress_test && make check-$(1) spec=$(2)\n\n\
 Open the failing test in the interactive test runner:\n\
-\tmake run-$(1) spec=$(2)\n"
+\tcd cypress_test && make run-$(1) spec=$(2)\n"
 endef
 
 NODE_BINS = \
commit 50500974cd3cb7a261c5f1a869c300002a102b15
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Jun 15 12:41:04 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon Jun 15 14:44:02 2020 +0200

    cypress: improve 'Show track changes.' test.
    
    Change-Id: I1ec60bdc66f6b080478c5c9db55e504f1f856f02
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96327
    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/writer/hamburger_menu_spec.js b/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
index 1dae35427..e42512c3d 100644
--- a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
@@ -101,6 +101,16 @@ describe('Trigger hamburger menu options.', function() {
 		cy.get('#copy-paste-container p')
 			.should('have.text', '\n\n\n');
 
+		// We have a multiline selection
+		cy.get('.leaflet-marker-icon:nth-of-type(1)')
+			.then(function(firstMarker) {
+				cy.get('.leaflet-marker-icon:nth-of-type(2)')
+					.then(function(secondMarker) {
+						expect(firstMarker.offset().top).to.be.lessThan(secondMarker.offset().top);
+						expect(firstMarker.offset().left).to.be.lessThan(secondMarker.offset().left);
+					});
+			});
+
 		// Remove text selection.
 		cy.get('textarea.clipboard')
 			.type('{leftArrow}');
@@ -124,7 +134,7 @@ describe('Trigger hamburger menu options.', function() {
 				cy.get('.leaflet-marker-icon:nth-of-type(2)')
 					.then(function(secondMarker) {
 						expect(firstMarker.offset().top).to.be.equal(secondMarker.offset().top);
-						expect(firstMarker.offset().bottom).to.be.equal(secondMarker.offset().bottom);
+						expect(firstMarker.offset().left).to.be.lessThan(secondMarker.offset().left);
 					});
 			});
 	});