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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/writer/insert_object_spec.js |    4 +-
 cypress_test/plugins/blacklists.js                                 |   19 ++++++++++
 cypress_test/plugins/index.js                                      |    5 ++
 3 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit 980e2a16493831f95df1c92e4fa90f822190d2dd
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Wed Sep 16 15:08:19 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Thu Sep 17 12:23:19 2020 +0200

    cypress: php-proxy: fix insert header test.
    
    Change-Id: Id04c35fcdf465ab2e56d1803808d2a0afffef6d6
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102890
    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/writer/insert_object_spec.js b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
index b9ffa6294..c2731075d 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
@@ -135,7 +135,9 @@ describe('Insert objects via insertion wizard.', function() {
 
 	it('Insert header.', function() {
 		// Get the blinking cursor pos
-		helper.typeIntoDocument('xxxx');
+		helper.typeIntoDocument('xx{enter}');
+
+		helper.typeText('body', 'xxxx', 500);
 
 		getCursorPos('left', 'cursorOrigLeft');
 
commit bdcfb9a1f0468db1c2869c4008165929ac95ae1f
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Wed Sep 16 14:23:54 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Thu Sep 17 12:23:05 2020 +0200

    cypress: php-proxy: blacklist image insertion tests.
    
    For some reasion cypress image loading mechnism is not
    working with php-proxy. Without cypress image insertion
    works. So now I disable this test, later we can fix-up
    cypress test to handle this scenario.
    
    Change-Id: Id1b62f28b3f0cdfe9e26cc96dbafcbacbf472be8
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102889
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/plugins/blacklists.js b/cypress_test/plugins/blacklists.js
index b389f6260..6efced9e7 100644
--- a/cypress_test/plugins/blacklists.js
+++ b/cypress_test/plugins/blacklists.js
@@ -79,5 +79,24 @@ var nextcloudBlackList = [
 	],
 ];
 
+var phpProxyBlackList = [
+	['mobile/calc/insertion_wizard_spec.js',
+		[
+			'Inset local image.'
+		]
+	],
+	['mobile/writer/insert_object_spec.js',
+		[
+			'Insert local image.'
+		]
+	],
+	['mobile/impress/insertion_wizard_spec.js',
+		[
+			'Insert local image.'
+		]
+	],
+];
+
 module.exports.coreBlackLists = coreBlackLists;
 module.exports.nextcloudBlackList = nextcloudBlackList;
+module.exports.phpProxyBlackList = phpProxyBlackList;
diff --git a/cypress_test/plugins/index.js b/cypress_test/plugins/index.js
index ae7640370..ec2ca4586 100644
--- a/cypress_test/plugins/index.js
+++ b/cypress_test/plugins/index.js
@@ -79,6 +79,11 @@ function pickTests(filename, foundTests, config) {
 		testsToRun = removeBlacklistedTest(filename, testsToRun, NCblackList);
 	}
 
+	if (process.env.CYPRESS_INTEGRATION === 'php-proxy') {
+		var ProxyblackList = blacklists.phpProxyBlackList;
+		testsToRun = removeBlacklistedTest(filename, testsToRun, ProxyblackList);
+	}
+
 	return testsToRun;
 }