[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js |   11 +++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 0bf076fc729765b56738a1263674082892d29e50
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Jul 9 07:54:24 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Aug 14 17:43:14 2020 +0200

    cypress: avoid failure of time field insertion (impress, mobile).
    
    Change-Id: I0330ae701a8d6a84f2cb57bc5ccef88f9fe56ecf
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98394
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit dc5c44f712dfbaa42a8a0fe171638ca241799a93)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100750

diff --git a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
index 794fd5e4d..1231b5efb 100644
--- a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
@@ -33,7 +33,7 @@ describe('Impress insertion wizard.', function() {
 		helper.selectAllText(false);
 	}
 
-	function selectionShouldBeTextShape() {
+	function selectionShouldBeTextShape(checkTextShape = true) {
 		// Check that the shape is there
 		cy.get('.leaflet-pane.leaflet-overlay-pane svg')
 			.should(function(svg) {
@@ -41,8 +41,9 @@ describe('Impress insertion wizard.', function() {
 				expect(svg[0].getBBox().height).to.be.greaterThan(0);
 			});
 
-		cy.get('.leaflet-pane.leaflet-overlay-pane g.Page g')
-			.should('have.class', 'com.sun.star.drawing.TextShape');
+		if (checkTextShape)
+			cy.get('.leaflet-pane.leaflet-overlay-pane svg g.com\\.sun\\.star\\.drawing\\.TextShape')
+				.should('exist');
 
 		// Check also that the shape is fully visible
 		// TODO: shapes are hungs out of the slide after insertion
@@ -272,7 +273,7 @@ describe('Impress insertion wizard.', function() {
 			.click();
 
 		// Check that the shape is there
-		selectionShouldBeTextShape();
+		selectionShouldBeTextShape(false);
 
 		// Check the text
 		selectTextOfShape();
@@ -293,7 +294,7 @@ describe('Impress insertion wizard.', function() {
 			.click();
 
 		// Check that the shape is there
-		selectionShouldBeTextShape();
+		selectionShouldBeTextShape(false);
 
 		// Check the text
 		selectTextOfShape();