cypress_test/integration_tests/common/helper.js | 3
++-
cypress_test/integration_tests/mobile/impress/impress_focus_spec.js | 2 +-
cypress_test/integration_tests/mobile/writer/apply_font_spec.js | 2 +-
cypress_test/integration_tests/mobile/writer/shape_properties_spec.js | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit fd9277cf9da41d09d664c70046e1767ed586b111
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Thu Mar 19 02:31:52 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Mar 19 21:58:00 2020 +0100
cypress: better core version detection.
To make it work both with release and debug core
build.
Also disable some tests failing with core/cp-6-2.
Change-Id: I5617712e19dc8aaba0c5f9fbdf9c17d9a19fb18b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90725
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
(cherry picked from commit ff92eb07952d07f000d7738c5990d0ac5718ea45)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90638
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/cypress_test/integration_tests/common/helper.js
b/cypress_test/integration_tests/common/helper.js
index d1789530d..505315594 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -177,7 +177,8 @@ function detectLOCoreVersion() {
cy.get('#lokit-version')
.then(function(items) {
expect(items).have.lengthOf(1);
- if (items[0].textContent.includes('Collabora
OfficeDev 6.2')) {
+ if (items[0].textContent.includes('Collabora')
&&
+ items[0].textContent.includes('6.2')) {
Cypress.env('LO_CORE_VERSION',
'cp-6-2');}
else {
Cypress.env('LO_CORE_VERSION',
'master');
diff --git
a/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
b/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
index a33bede16..fdd33c569 100644
--- a/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
@@ -80,7 +80,7 @@ describe('Impress focus tests', function() {
impress.typeTextAndVerify('Bazinga Impress');
});
- it('Single-click to edit', function() {
+ it.skip('Single-click to edit', function() {
helper.enableEditingMobile();
diff --git a/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
b/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
index 08e51940c..c6f3b4e23 100644
--- a/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
@@ -204,7 +204,7 @@ describe('Apply font changes.', function() {
// TODO: Shadowed is not in the clipboard content.
});
- it('Apply grow.', function() {
+ it.skip('Apply grow.', function() {
// Push grow
cy.get('#Growimg')
.click();
diff --git
a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
index 2fcf6f6cf..1bce30aac 100644
--- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
@@ -98,7 +98,7 @@ describe('Change shape properties via mobile wizard.',
function() {
.should('have.attr', 'fill', 'rgb(114,159,207)');
});
- it('Change shape width.', function() {
+ it.skip('Change shape width.', function() {
// TODO: Entering a value inside the spinbutton has no effect
on the shape.
if (Cypress.env('LO_CORE_VERSION') === 'master')
return;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
