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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/calc/calc_helper.js        |   12 +++---
 cypress_test/integration_tests/mobile/calc/spellchecking_spec.js |   18 ++--------
 2 files changed, 11 insertions(+), 19 deletions(-)

New commits:
commit ed3f516185cc48b1f86a87675d3646fcc9b5a19b
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Jun 22 13:10:49 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Wed Sep 2 17:04:28 2020 +0200

    cypress: stabilize calc/spellchecking_spec.js test.
    
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96856
    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 14be173ccd74766177a9d27cfdb87ad20c572f8e)
    
    Change-Id: I8f49e305c32cf24f167890e8e9d8088440bb788e
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101939
    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/calc_helper.js b/cypress_test/integration_tests/mobile/calc/calc_helper.js
index 47a14aa9c..d0e966913 100644
--- a/cypress_test/integration_tests/mobile/calc/calc_helper.js
+++ b/cypress_test/integration_tests/mobile/calc/calc_helper.js
@@ -35,12 +35,8 @@ function selectAllMobile(removeSelection = true) {
 	cy.get('#spreadsheet-header-corner')
 		.click();
 
-	cy.get('.spreadsheet-cell-resize-marker:nth-of-type(2)')
-		.should('not.be.visible');
-
-	cy.get('.spreadsheet-cell-resize-marker:nth-of-type(1)')
-		.invoke('attr', 'style')
-		.should('contain', '(-9px, -8px,');
+	cy.get('.spreadsheet-cell-resize-marker')
+		.should('be.visible');
 
 	cy.get('input#addressInput')
 		.should('have.prop', 'value', 'A1:AMJ1048576');
diff --git a/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js b/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js
index 198603ba8..8af197b36 100644
--- a/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js
@@ -60,16 +60,6 @@ describe('Calc spell checking menu.', function() {
 		cy.contains('.context-menu-link', 'hello')
 			.click();
 
-		// Click outside of the cell
-		cy.get('.leaflet-marker-icon')
-			.then(function(items) {
-				expect(items).to.have.length(2);
-				var XPos = items[0].getBoundingClientRect().right;
-				var YPos = items[0].getBoundingClientRect().bottom + 10;
-				cy.get('body')
-					.click(XPos, YPos);
-			});
-
 		calcHelper.selectAllMobile();
 
 		cy.get('#copy-paste-container table td')
@@ -106,9 +96,9 @@ describe('Calc spell checking menu.', function() {
 			.click();
 
 		// Click outside of the cell
-		cy.get('.leaflet-marker-icon')
+		cy.get('.leaflet-selection-marker-end')
 			.then(function(items) {
-				expect(items).to.have.length(2);
+				expect(items).to.have.length(1);
 				var XPos = items[0].getBoundingClientRect().right;
 				var YPos = items[0].getBoundingClientRect().bottom + 10;
 				cy.get('body')
@@ -129,9 +119,9 @@ describe('Calc spell checking menu.', function() {
 			.click();
 
 		// Click outside of the cell
-		cy.get('.leaflet-marker-icon')
+		cy.get('.leaflet-selection-marker-end')
 			.then(function(items) {
-				expect(items).to.have.length(2);
+				expect(items).to.have.length(1);
 				var XPos = items[0].getBoundingClientRect().right;
 				var YPos = items[0].getBoundingClientRect().bottom + 10;
 				cy.get('body')
commit c71f7a852dc2526f85c1d2fbf6465b7bfcdfb8dc
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Jun 19 16:24:23 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Wed Sep 2 17:04:21 2020 +0200

    cypress: stabilize calc/cell_appearance_spec.js test.
    
    Change-Id: I3695e3e5608dee9b6f1f7f1dfc43dad76d9844f1
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96740
    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 008d4ea32f475a669668394f6b886d255a586090)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101938

diff --git a/cypress_test/integration_tests/mobile/calc/calc_helper.js b/cypress_test/integration_tests/mobile/calc/calc_helper.js
index cd24896ce..47a14aa9c 100644
--- a/cypress_test/integration_tests/mobile/calc/calc_helper.js
+++ b/cypress_test/integration_tests/mobile/calc/calc_helper.js
@@ -18,6 +18,9 @@ function removeTextSelection() {
 		cy.get('.spreadsheet-cell-resize-marker')
 			.invoke('attr', 'style')
 			.should('contain', '-8px,');
+
+		cy.get('input#addressInput')
+			.should('have.prop', 'value', 'B1:B1048576');
 	}
 
 	cy.log('Removing text selection - end.');
@@ -39,6 +42,9 @@ function selectAllMobile(removeSelection = true) {
 		.invoke('attr', 'style')
 		.should('contain', '(-9px, -8px,');
 
+	cy.get('input#addressInput')
+		.should('have.prop', 'value', 'A1:AMJ1048576');
+
 	cy.log('Selecting all text - end.');
 }