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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/writer/focus_spec.js |    7 +++----
 loleaflet/src/map/handler/Map.TouchGesture.js              |    2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 584e707ddb779fc909a98d03ae9488d6c3e39650
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Mar 13 11:23:32 2020 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Mar 13 12:03:56 2020 +0100

    cypress: mobile: reenable a focus related test.
    
    This test does not work since:
    ac961d7b67fcb5fb97cb6a620c913debb74ba8c1
    
    Now I just remove that for cypress test, later we need
    to improve the mobile emulation.
    
    Change-Id: I18310fe27cd727b63b6f0e4f3e939cdbada05520
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90458
    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/focus_spec.js b/cypress_test/integration_tests/mobile/writer/focus_spec.js
index 919b25d72..5073315b9 100644
--- a/cypress_test/integration_tests/mobile/writer/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/focus_spec.js
@@ -201,10 +201,9 @@ describe('Focus tests', function() {
 					.dblclick(posX, posY);
 			});
 
-		// Document still has the focus
-		// TODO: Focus is inconsistent here.
-		//cy.document().its('activeElement.className')
-		//	.should('be.eq', 'clipboard');
+		// Document grabs the focus
+		cy.document().its('activeElement.className')
+			.should('be.eq', 'clipboard');
 	});
 
 	it('Focus with hamburger menu.', function() {
diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js b/loleaflet/src/map/handler/Map.TouchGesture.js
index 1fc7479c6..99ff04a9f 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -313,7 +313,7 @@ L.Map.TouchGesture = L.Handler.extend({
 		// by the double-tap and triple-tap handlers below.
 		// Note: Hammer has requireFailure() which supressses this call
 		// when multi-taps are detected. This isn't working for us.
-		if (e.tapCount > 1)
+		if (e.tapCount > 1 && !L.Browser.cypressTest)
 			return;
 
 		var point = e.pointers[0],