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

[Tamás Zolnai (via logerrit)]

 cypress_test/data/mobile/impress/slide_properties2.odp                 |binary
 cypress_test/integration_tests/mobile/impress/slide_properties_spec.js |   96 +++++++++-
 2 files changed, 91 insertions(+), 5 deletions(-)

New commits:
commit dc1235943b64612979d0acf0daf221e591aaa8ee
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue May 26 11:03:33 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue May 26 12:52:13 2020 +0200

    cypress: add some more slide background tests (mobile).
    
    Change-Id: I61f57098993a65b0a1d596e4c60dd44adb1bf6ff
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94824
    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/impress/slide_properties2.odp b/cypress_test/data/mobile/impress/slide_properties2.odp
new file mode 100644
index 000000000..c92dc927c
Binary files /dev/null and b/cypress_test/data/mobile/impress/slide_properties2.odp differ
diff --git a/cypress_test/integration_tests/mobile/impress/slide_properties_spec.js b/cypress_test/integration_tests/mobile/impress/slide_properties_spec.js
index 9f326ccb3..571236c30 100644
--- a/cypress_test/integration_tests/mobile/impress/slide_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/slide_properties_spec.js
@@ -1,21 +1,24 @@
-/* global describe it beforeEach cy require afterEach expect */
+/* global describe it cy require afterEach expect */
 
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
 
 describe('Changing slide properties.', function() {
-	beforeEach(function() {
-		mobileHelper.beforeAllMobile('slide_properties.odp', 'impress');
+	var testFileName;
+
+	function before(fileName) {
+		testFileName = fileName;
+		mobileHelper.beforeAllMobile(testFileName, 'impress');
 
 		mobileHelper.enableEditingMobile();
 
 		previewShouldBeFullWhite();
 
 		mobileHelper.openMobileWizard();
-	});
+	}
 
 	afterEach(function() {
-		helper.afterAll('insertion_wizard.odp');
+		helper.afterAll(testFileName);
 	});
 
 	function previewShouldBeFullWhite(fullWhite = true, slideNumber = 1) {
@@ -48,6 +51,8 @@ describe('Changing slide properties.', function() {
 	}
 
 	it('Apply solid color background.', function() {
+		before('slide_properties.odp');
+
 		// Change fill style
 		cy.get('#fillstyle')
 			.click();
@@ -89,6 +94,8 @@ describe('Changing slide properties.', function() {
 	});
 
 	it('Apply gradient fill.', function() {
+		before('slide_properties.odp');
+
 		// Change fill style
 		cy.get('#fillstyle')
 			.click();
@@ -148,6 +155,8 @@ describe('Changing slide properties.', function() {
 	});
 
 	it('Apply hatching fill.', function() {
+		before('slide_properties.odp');
+
 		// Change fill style
 		cy.get('#fillstyle')
 			.click();
@@ -186,6 +195,8 @@ describe('Changing slide properties.', function() {
 	});
 
 	it('Apply bitmap fill.', function() {
+		before('slide_properties.odp');
+
 		// Change fill style
 		cy.get('#fillstyle')
 			.click();
@@ -224,6 +235,8 @@ describe('Changing slide properties.', function() {
 	});
 
 	it('Apply pattern fill.', function() {
+		before('slide_properties.odp');
+
 		// Change fill style
 		cy.get('#fillstyle')
 			.click();
@@ -260,4 +273,77 @@ describe('Changing slide properties.', function() {
 		cy.get('#fillattr1 .ui-header-left')
 			.should('have.text', '50 Percent');
 	});
+
+	it('Remove slide fill.', function() {
+		before('slide_properties.odp');
+
+		// Apply color fill first
+		cy.get('#fillstyle')
+			.click();
+
+		cy.contains('.ui-combobox-text', 'Color')
+			.click();
+
+		cy.get('#fillstyle .ui-header-left')
+			.should('have.text', 'Color');
+
+		previewShouldBeFullWhite(false);
+
+		// Reopen mobile wizard
+		mobileHelper.closeMobileWizard();
+		mobileHelper.openMobileWizard();
+
+		cy.get('#fillstyle .ui-header-left')
+			.should('have.text', 'Color');
+
+		// Remove fill
+		cy.get('#fillstyle')
+			.click();
+
+		cy.contains('.ui-combobox-text', 'None')
+			.click();
+
+		cy.get('#fillstyle .ui-header-left')
+			.should('have.text', 'None');
+
+		previewShouldBeFullWhite();
+
+		// Reopen mobile wizard and check the settings again
+		mobileHelper.closeMobileWizard();
+		mobileHelper.openMobileWizard();
+
+		cy.get('#fillstyle .ui-header-left')
+			.should('have.text', 'None');
+	});
+
+	it('Change master background.', function() {
+		before('slide_properties2.odp');
+
+		// Master background is disabled, enable it first
+		cy.get('input#displaymasterbackground')
+			.should('not.have.prop', 'checked', true);
+
+		cy.get('input#displaymasterbackground')
+			.click();
+
+		cy.get('input#displaymasterbackground')
+			.should('have.prop', 'checked', true);
+
+		previewShouldBeFullWhite(false);
+
+		// Reopen mobile wizard and change the settings again
+		mobileHelper.closeMobileWizard();
+		mobileHelper.openMobileWizard();
+
+		cy.get('input#displaymasterbackground')
+			.should('have.prop', 'checked', true);
+
+		cy.get('input#displaymasterbackground')
+			.click();
+
+		cy.get('input#displaymasterbackground')
+			.should('not.have.prop', 'checked', true);
+
+		previewShouldBeFullWhite();
+	});
 });