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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/common/calc.js                        |   10 ++++------
 cypress_test/integration_tests/mobile/calc/alignment_options_spec.js |    4 ++--
 cypress_test/integration_tests/mobile/calc/focus_spec.js             |    4 ----
 cypress_test/integration_tests/mobile/calc/number_format_spec.js     |    4 ++--
 4 files changed, 8 insertions(+), 14 deletions(-)

New commits:
commit 262e9f94753994f31c22bfbc98c8b25a8ce1b043
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri May 15 11:56:03 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri May 15 15:27:58 2020 +0200

    cypress: simplify clickFormulaBar() method.
    
    It's always called without arguments.
    
    Change-Id: I3f825b23c4e8b0079019dc916a8357ba94cda4f1
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94289
    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/common/calc.js b/cypress_test/integration_tests/common/calc.js
index 1ed2ef289..1e148d2fa 100644
--- a/cypress_test/integration_tests/common/calc.js
+++ b/cypress_test/integration_tests/common/calc.js
@@ -1,9 +1,9 @@
 /* global cy expect */
 
 // Click on the formula bar.
-// moveMouse is set to avoid leaving the mouse on the Formula-Bar,
+// mouseover is triggered to avoid leaving the mouse on the Formula-Bar,
 // which shows the tooltip and messes up tests.
-function clickFormulaBar(XPos = -1, moveMouse = true) {
+function clickFormulaBar() {
 
 	// The inputbar_container is 100% width, which
 	// can extend behind the sidebar. So we can't
@@ -14,15 +14,13 @@ function clickFormulaBar(XPos = -1, moveMouse = true) {
 	cy.get('.inputbar_canvas')
 		.then(function(items) {
 			expect(items).to.have.lengthOf(1);
-			if (XPos < 0) // Click in the center if undefined.
-				XPos = items[0].getBoundingClientRect().width / 2;
+			var XPos = items[0].getBoundingClientRect().width / 2;
 			var YPos = items[0].getBoundingClientRect().height / 2;
 			cy.get('.inputbar_container')
 				.click(XPos, YPos);
 		});
 
-	if (moveMouse)
-		cy.get('body').trigger('mouseover');
+	cy.get('body').trigger('mouseover');
 }
 
 // Click on the first cell.
diff --git a/cypress_test/integration_tests/mobile/calc/focus_spec.js b/cypress_test/integration_tests/mobile/calc/focus_spec.js
index 8ed94512c..e13bf6155 100644
--- a/cypress_test/integration_tests/mobile/calc/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/focus_spec.js
@@ -95,7 +95,6 @@ describe('Calc focus tests', function() {
 
 		// Click in the formula-bar.
 		calc.clickFormulaBar();
-		cy.get('body').trigger('mouseover');
 		helper.assertCursorAndFocus();
 
 		// Type some text.
@@ -110,7 +109,6 @@ describe('Calc focus tests', function() {
 
 		// Check the text we typed.
 		calc.clickFormulaBar();
-		cy.get('body').trigger('mouseover');
 		helper.assertCursorAndFocus();
 		cy.get('textarea.clipboard').type('{ctrl}a');
 		helper.expectTextForClipboard(text1);
@@ -123,7 +121,6 @@ describe('Calc focus tests', function() {
 		cy.log('Appending text at the end.');
 		calc.clickOnFirstCell();
 		calc.clickFormulaBar();
-		cy.get('body').trigger('mouseover');
 		helper.assertCursorAndFocus();
 		var text2 = ', this is a test.';
 		cy.get('textarea.clipboard').type(text2);
@@ -138,7 +135,6 @@ describe('Calc focus tests', function() {
 		cy.log('Inserting text in the middle.');
 		calc.clickOnFirstCell();
 		calc.clickFormulaBar();
-		cy.get('body').trigger('mouseover');
 		helper.assertCursorAndFocus();
 
 		// Move cursor before text2
commit 2598417df711f8647cfe2c1932fcb3154836d443
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri May 15 11:57:29 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri May 15 15:27:47 2020 +0200

    cypress: reenable checkboxes related tests.
    
    This reverts commit e07a94abc1ed844334040acf21c1085a074e418a.
    
    Change-Id: I9b1cd05f8ad6acc065c941cd17d886ead75f12be
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94290
    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/alignment_options_spec.js b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
index 077b1be3b..a3b5c0165 100644
--- a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
@@ -268,7 +268,7 @@ describe('Change alignment settings.', function() {
 			});
 	});
 
-	it.skip('Enable text wrapping.', function() {
+	it('Enable text wrapping.', function() {
 		helper.initAliasToNegative('originalTextPos');
 
 		getTextPosForFirstCell();
@@ -322,7 +322,7 @@ describe('Change alignment settings.', function() {
 		// neither the text position nor the clipboard container helps here.
 	});
 
-	it.skip('Merge cells.', function() {
+	it('Merge cells.', function() {
 		// Select the full row
 		cy.get('.spreadsheet-header-rows')
 			.then(function(items) {
diff --git a/cypress_test/integration_tests/mobile/calc/number_format_spec.js b/cypress_test/integration_tests/mobile/calc/number_format_spec.js
index 39d3b2f91..efd7576d7 100644
--- a/cypress_test/integration_tests/mobile/calc/number_format_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/number_format_spec.js
@@ -385,7 +385,7 @@ describe('Apply number formatting.', function() {
 			.should('have.text', '001000');
 	});
 
-	it.skip('Apply red color for negative numbers.', function() {
+	it('Apply red color for negative numbers.', function() {
 		// Check default value
 		cy.get('#negativenumbersred input')
 			.should('not.have.prop', 'checked', true);
@@ -406,7 +406,7 @@ describe('Apply number formatting.', function() {
 			.should('have.text', '1000');
 	});
 
-	it.skip('Add thousands separator.', function() {
+	it('Add thousands separator.', function() {
 		// Check default value
 		cy.get('#thousandseparator input')
 			.should('not.have.prop', 'checked', true);