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

Tamás Zolnai (via logerrit) logerrit at kemper.freedesktop.org
Mon Jul 6 11:07:55 UTC 2020


 cypress_test/data/mobile/writer/table_properties.odt                  |binary
 cypress_test/integration_tests/mobile/writer/table_properties_spec.js |   74 +++++-----
 cypress_test/plugins/blacklists.js                                    |    3 
 3 files changed, 39 insertions(+), 38 deletions(-)

New commits:
commit f934aa59a8076f865f92b9cb9ff1774d4ea42b08
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Jul 6 12:20:18 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon Jul 6 13:07:36 2020 +0200

    cypress: update writer table related tests.
    
    Change-Id: I70039a14d6ad8ee33ae833c24111e6ca8d8caee4
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98202
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/data/mobile/writer/table_properties.odt b/cypress_test/data/mobile/writer/table_properties.odt
index bec92754c..97892514e 100644
Binary files a/cypress_test/data/mobile/writer/table_properties.odt and b/cypress_test/data/mobile/writer/table_properties.odt differ
diff --git a/cypress_test/integration_tests/mobile/writer/table_properties_spec.js b/cypress_test/integration_tests/mobile/writer/table_properties_spec.js
index 9b87567b3..c9f62e148 100644
--- a/cypress_test/integration_tests/mobile/writer/table_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/table_properties_spec.js
@@ -26,8 +26,10 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#TableEditPanel')
 			.click();
 
-		cy.get('.ui-content.level-0.mobile-wizard')
+		cy.get('#InsertRowsBefore')
 			.should('be.visible');
+
+		cy.wait(500);
 	}
 
 	function moveCursorToFirstCell() {
@@ -43,6 +45,13 @@ describe('Change table properties / layout via mobile wizard.', function() {
 			});
 	}
 
+	function selectFullTable() {
+		cy.get('textarea.clipboard')
+			.type('{downarrow}{downarrow}{downarrow}{downarrow}');
+
+		writerMobileHelper.selectAllMobile();
+	}
+
 	it('Insert row before.', function() {
 		before('table_properties.odt');
 
@@ -54,7 +63,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('.leaflet-marker-icon.table-row-resize-marker')
 			.should('have.length', 4);
 
-		writerMobileHelper.selectAllMobile();
+		selectFullTable();
 
 		// Check rows / columns
 		cy.get('#copy-paste-container tr')
@@ -78,7 +87,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('.leaflet-marker-icon.table-row-resize-marker')
 			.should('have.length', 4);
 
-		writerMobileHelper.selectAllMobile();
+		selectFullTable();
 
 		// Check rows / columns
 		cy.get('#copy-paste-container tr')
@@ -102,7 +111,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('.leaflet-marker-icon.table-column-resize-marker')
 			.should('have.length', 4);
 
-		writerMobileHelper.selectAllMobile();
+		selectFullTable();
 
 		// Check rows / columns
 		cy.get('#copy-paste-container tr')
@@ -126,7 +135,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('.leaflet-marker-icon.table-column-resize-marker')
 			.should('have.length', 4);
 
-		writerMobileHelper.selectAllMobile();
+		selectFullTable();
 
 		// Check rows / columns
 		cy.get('#copy-paste-container tr')
@@ -150,7 +159,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('.leaflet-marker-icon.table-row-resize-marker')
 			.should('have.length', 2);
 
-		writerMobileHelper.selectAllMobile();
+		selectFullTable();
 
 		// Check rows / columns
 		cy.get('#copy-paste-container tr')
@@ -166,26 +175,24 @@ describe('Change table properties / layout via mobile wizard.', function() {
 	it('Delete column.', function() {
 		before('table_properties.odt');
 
+		// Insert column first
 		openTablePanel();
 
-		cy.get('#DeleteColumns')
+		cy.get('#InsertColumnsBefore')
 			.click();
 
 		cy.get('.leaflet-marker-icon.table-column-resize-marker')
-			.should('not.exist');
+			.should('have.length', 4);
 
-		writerMobileHelper.selectAllMobile();
+		// Then delete it
+		mobileHelper.closeMobileWizard();
+		openTablePanel();
 
-		// Check rows / columns
-		cy.get('#copy-paste-container tr')
+		cy.get('#DeleteColumns')
+			.click();
+
+		cy.get('.leaflet-marker-icon.table-column-resize-marker')
 			.should('have.length', 3);
-		cy.get('#copy-paste-container td')
-			.should(function(columns) {
-				expect(columns).to.have.lengthOf(3);
-				expect(columns[0].textContent).to.not.have.string('text');
-				expect(columns[1].textContent).to.not.have.string('text');
-				expect(columns[2].textContent).to.not.have.string('text');
-			});
 	});
 
 	it('Delete table.', function() {
@@ -226,7 +233,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#MergeCells')
 			.click();
 
-		writerMobileHelper.selectAllMobile();
+		selectFullTable();
 
 		// Check rows / columns
 		cy.get('#copy-paste-container tr')
@@ -235,7 +242,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 			.should('have.length', 3);
 	});
 
-	it('Change row height.', function() {
+	it.skip('Change row height.', function() {
 		before('table_properties.odt');
 
 		openTablePanel();
@@ -251,34 +258,31 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#rowheight .spinfield')
 			.should('have.attr', 'value', '1.4');
 
-		writerMobileHelper.selectAllMobile();
+		selectFullTable();
 
 		// Check row height
 		cy.get('#copy-paste-container td')
 			.should('have.attr', 'height', '125');
 	});
 
-	it('Change column width.', function() {
+	it.skip('Change column width.', function() {
 		before('table_properties.odt');
 
 		openTablePanel();
 
-		cy.get('#columnwidth .spinfield')
-			.should('have.attr', 'value', '3.46');
-
 		cy.get('#columnwidth .spinfield')
 			.clear()
-			.type('5.6')
+			.type('1.6')
 			.type('{enter}');
 
 		cy.get('#columnwidth .spinfield')
-			.should('have.attr', 'value', '5.6');
+			.should('have.attr', 'value', '1.6');
 
-		writerMobileHelper.selectAllMobile();
+		selectFullTable();
 
 		// Check row height
 		cy.get('#copy-paste-container td')
-			.should('have.attr', 'width', '81%');
+			.should('have.attr', 'width', '145');
 	});
 
 	it('Set minimal row height.', function() {
@@ -294,7 +298,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#SetMinimalRowHeight')
 			.click();
 
-		writerMobileHelper.selectAllMobile();
+		selectFullTable();
 
 		// Check new row height
 		cy.get('#copy-paste-container td')
@@ -313,7 +317,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#SetOptimalRowHeight')
 			.click();
 
-		writerMobileHelper.selectAllMobile();
+		selectFullTable();
 
 		// Check new row height
 		cy.get('#copy-paste-container td')
@@ -342,7 +346,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#DistributeRows')
 			.click();
 
-		writerMobileHelper.selectAllMobile();
+		selectFullTable();
 
 		// Check new row height
 		cy.get('#copy-paste-container td')
@@ -371,7 +375,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#SetMinimalColumnWidth')
 			.click();
 
-		writerMobileHelper.selectAllMobile();
+		selectFullTable();
 
 		cy.get('#copy-paste-container td')
 			.should('have.attr', 'width', '24');
@@ -389,7 +393,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#SetOptimalColumnWidth')
 			.click();
 
-		writerMobileHelper.selectAllMobile();
+		selectFullTable();
 
 		cy.get('#copy-paste-container td:nth-of-type(1n)')
 			.should('have.attr', 'width', '324');
@@ -409,7 +413,7 @@ describe('Change table properties / layout via mobile wizard.', function() {
 		cy.get('#DistributeColumns')
 			.click();
 
-		writerMobileHelper.selectAllMobile();
+		selectFullTable();
 
 		cy.get('#copy-paste-container td')
 			.should('have.attr', 'width', '323');
diff --git a/cypress_test/plugins/blacklists.js b/cypress_test/plugins/blacklists.js
index cc70e2cee..f76c76b46 100644
--- a/cypress_test/plugins/blacklists.js
+++ b/cypress_test/plugins/blacklists.js
@@ -44,9 +44,6 @@ var testBlackLists = {
 	],
 
 	'cp-6-4': [
-		['mobile/writer/table_properties_spec.js',
-			[]
-		],
 	],
 
 	'cp-6-2': [


More information about the Libreoffice-commits mailing list