Rebased ref, commits from common ancestor:
commit 9ab7711dc13e55f80b218a1690592215cefbbd49
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Sun Feb 23 11:46:17 2020 +0100
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Sun Feb 23 11:49:10 2020 +0100
parallel-cypress: Make sure that npm packages are not installed more times.
When we build with more jobs.
Change-Id: I1051825ec8db4ccc7e10bd4a599480a97334538d
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index f5df78c00..9453f0969 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -5,6 +5,7 @@ CYPRESS_BINARY =
${abs_builddir}/node_modules/cypress/bin/cypress
ESLINT_BINARY = ${abs_builddir}/node_modules/eslint/bin/eslint.js
WAIT_ON_BINARY = ${abs_builddir}/node_modules/wait-on/bin/wait-on
GET_PORT_BINARY = ${abs_builddir}/node_modules/get-port-cli/cli.js
+NPM_INSTALLED = $(abs_builddir)/workdir/npm_installed
PID_FILE=$(abs_builddir)/loolwsd.pid
@@ -161,8 +162,12 @@ NODE_BINS = \
$(WAIT_ON_BINARY) \
$(GET_PORT_BINARY)
-$(NODE_BINS):
+$(NODE_BINS): $(NPM_INSTALLED);
+
+$(NPM_INSTALLED):
@npm install
+ @mkdir -p $(dir $(NPM_INSTALLED))
+ @touch $(NPM_INSTALLED)
endif
commit 7725c9038fe55781653528be273ab809890efcae
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Sat Feb 22 11:48:33 2020 +0100
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Sun Feb 23 11:49:10 2020 +0100
parallel-cypress: during parallel build don't write out execution
line-by-line
Because in this case, the output of the different threads will be
mixed in the command line.
For sequential build keep the original behavior.
Change-Id: Ibf9bf7c6111f8b5b0cf188fab66b97dedd613c65
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index ba4bed9d4..f5df78c00 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -22,6 +22,7 @@ MOBILE_TRACK_FOLDER=$(abs_builddir)/workdir/track/mobile
ALLOWED_PORTS = $(shell seq 9900 1 9980)
KILL_COMMAND=pkill -F $(PID_FILE) || pkill --signal SIGKILL -F $(PID_FILE)
+PARALLEL_BUILD = $(findstring jobserver,$(MAKEFLAGS))
if HAVE_LO_PATH
MOBILE_TEST_FILES= \
@@ -129,27 +130,29 @@ define start_loolwsd
endef
define run_desktop_tests
+ @echo $(if $(1),"Running cypress desktop test: $(1)","Running cypress
desktop tests...")
@echo
- @echo "Running cypress desktop tests..."
- @echo
- $(CYPRESS_BINARY) run --browser $(CHROME) \
+ $(eval RUN_COMMAND = \
+ $(CYPRESS_BINARY) run --browser $(CHROME) \
--config
integrationFolder=$(DESKTOP_TEST_FOLDER),userAgent=$(DESKTOP_USER_AGENT) \
--headless \
--env
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT)
\
$(if $(1),
--spec=${abs_dir}/integration_tests/desktop/$(1)) \
- || ($(KILL_COMMAND) && false)
+ || ($(KILL_COMMAND) && false))
+ $(if $(PARALLEL_BUILD),@echo "`echo $(RUN_COMMAND) &&
$(RUN_COMMAND)`",$(RUN_COMMAND))
endef
define run_mobile_tests
+ @echo $(if $(1),"Running cypress mobile test: $(1)","Running cypress
mobile tests...")
@echo
- @echo "Running cypress mobile tests..."
- @echo
- $(CYPRESS_BINARY) run --browser $(CHROME) \
+ $(eval RUN_COMMAND = \
+ $(CYPRESS_BINARY) run --browser $(CHROME) \
--config
integrationFolder=$(MOBILE_TEST_FOLDER),userAgent=$(MOBILE_USER_AGENT) \
--headless \
--env
DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT)
\
$(if $(1),
--spec=$(abs_dir)/integration_tests/mobile/$(1)) \
- || ($(KILL_COMMAND) && false)
+ || ($(KILL_COMMAND) && false))
+ $(if $(PARALLEL_BUILD),@echo "`echo $(RUN_COMMAND) &&
$(RUN_COMMAND)`",$(RUN_COMMAND))
endef
NODE_BINS = \
commit bc4837722bf0a0d6efe71e909ab3c99cdb7405bc
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Sat Feb 22 10:42:49 2020 +0100
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Sun Feb 23 11:49:06 2020 +0100
parallel-cypress: some cleanup around loolwsd server starting
Change-Id: Ia762d9ae73a40ea9debf0b847bc93e8e9171284d
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index ed59bcf5c..ba4bed9d4 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -57,7 +57,6 @@ check-local: $(MOBILE_TEST_FILES_DONE)
$(DESKTOP_TEST_FILES_DONE)
$(PID_FILE): @JAILS_PATH@ $(NODE_BINS)
$(call run_JS_error_check)
- $(eval FREE_PORT:=$(shell $(GET_PORT_BINARY) --host=127.0.0.1
$(ALLOWED_PORTS)))
$(call start_loolwsd)
$(MOBILE_TEST_FILES_DONE): $(PID_FILE)
@@ -111,6 +110,7 @@ define run_JS_error_check
endef
define start_loolwsd
+ $(eval FREE_PORT:=$(shell $(GET_PORT_BINARY) --host=127.0.0.1
$(ALLOWED_PORTS)))
@echo "Found available port for testing: $(FREE_PORT)"
@echo
@echo "Launching loolwsd..."
@@ -120,9 +120,10 @@ define start_loolwsd
--o:child_root_path="@JAILS_PATH@"
--o:storage.filesystem[@allow]=true \
--disable-ssl \
--o:admin_console.username=admin
--o:admin_console.password=admin \
- --o:logging.file[@enable]=true --o:logging.level=trace
> /dev/null 2>&1 \
+ --o:logging.file[@enable]=true --o:logging.level=trace \
--port=$(FREE_PORT) \
- --pidfile=$(PID_FILE) &
+ --pidfile=$(PID_FILE) \
+ > /dev/null 2>&1 &
@$(WAIT_ON_BINARY) http://localhost:$(FREE_PORT) --timeout 60000
@echo
endef
commit cef46bf20394cfb3676148c685fe24944da69c6d
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Thu Feb 20 22:01:27 2020 +0100
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Sun Feb 23 11:47:22 2020 +0100
parallel-cypress: initial parallelization
- Run all spec files separately so we can run them
parallel.
- Use separate test files for all spec files.
- Disable two tests which are failing while running in parallel.
Change-Id: I521feeac6e1ac4c3d2c87e989c11d4231945e569
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 60f6df644..ed59bcf5c 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -12,24 +12,63 @@ DESKTOP_USER_AGENT = "cypress"
DESKTOP_TEST_FOLDER = ${abs_srcdir}/integration_tests/desktop
DESKTOP_DATA_FOLDER = ${abs_srcdir}/data/desktop/
DESKTOP_WORKDIR = ${abs_builddir}/workdir/desktop/
+DESKTOP_TRACK_FOLDER=$(abs_builddir)/workdir/track/desktop
MOBILE_USER_AGENT = "cypress mobile"
MOBILE_TEST_FOLDER = ${abs_srcdir}/integration_tests/mobile
MOBILE_DATA_FOLDER = ${abs_srcdir}/data/mobile/
MOBILE_WORKDIR = ${abs_builddir}/workdir/mobile/
+MOBILE_TRACK_FOLDER=$(abs_builddir)/workdir/track/mobile
ALLOWED_PORTS = $(shell seq 9900 1 9980)
-FREE_PORT=$(shell $(GET_PORT_BINARY) --host=127.0.0.1 $(ALLOWED_PORTS))
-
KILL_COMMAND=pkill -F $(PID_FILE) || pkill --signal SIGKILL -F $(PID_FILE)
if HAVE_LO_PATH
-check-local: @JAILS_PATH@ $(NODE_BINS)
+MOBILE_TEST_FILES= \
+ calc/calc_focus_spec.js \
+ impress/impress_focus_spec.js \
+ writer/apply_font_spec.js \
+ writer/apply_paragraph_properties_spec.js \
+ writer/bottom_toolbar_spec.js \
+ writer/focus_spec.js \
+ writer/insert_field_spec.js \
+ writer/insert_formatting_mark_spec.js \
+ writer/insert_object_spec.js \
+ writer/mobile_wizard_state_spec.js \
+ writer/shape_properties_spec.js \
+ writer/spellchecking_spec.js \
+ writer/styles_spec.js \
+ writer/table_properties_spec.js \
+ writer/toolbar_spec.js
+
+DEKSTOP_TEST_FILES= \
+ copy_paste_spec.js \
+ example_desktop_test_spec.js \
+ shape_operations_spec.js
+
+MOBILE_TEST_FILES_DONE= \
+ $(foreach
test_file,$(MOBILE_TEST_FILES),$(MOBILE_TRACK_FOLDER)/$(test_file).done)
+
+DESKTOP_TEST_FILES_DONE= \
+ $(foreach
test_file,$(DEKSTOP_TEST_FILES),$(DESKTOP_TRACK_FOLDER)/$(test_file).done)
+
+check-local: $(MOBILE_TEST_FILES_DONE) $(DESKTOP_TEST_FILES_DONE)
+ @$(KILL_COMMAND) || true
+
+$(PID_FILE): @JAILS_PATH@ $(NODE_BINS)
$(call run_JS_error_check)
+ $(eval FREE_PORT:=$(shell $(GET_PORT_BINARY) --host=127.0.0.1
$(ALLOWED_PORTS)))
$(call start_loolwsd)
- $(call run_desktop_tests)
- $(call run_mobile_tests)
- @$(KILL_COMMAND) || true
+
+$(MOBILE_TEST_FILES_DONE): $(PID_FILE)
+ $(call run_mobile_tests,$(subst $(MOBILE_TRACK_FOLDER),,$(basename $@)))
+ @mkdir -p $(dir $@)
+ @touch $@
+
+$(DESKTOP_TEST_FILES_DONE): $(PID_FILE)
+ $(call run_desktop_tests,$(subst $(DESKTOP_TRACK_FOLDER),,$(basename
$@)))
+ @mkdir -p $(dir $@)
+ @touch $@
check-desktop: @JAILS_PATH@ $(NODE_BINS)
$(call run_JS_error_check)
diff --git a/cypress_test/data/desktop/simple.odt
b/cypress_test/data/desktop/copy_paste.odt
similarity index 100%
rename from cypress_test/data/desktop/simple.odt
rename to cypress_test/data/desktop/copy_paste.odt
diff --git a/cypress_test/data/desktop/example.odt
b/cypress_test/data/desktop/example.odt
new file mode 100644
index 000000000..833aa18fa
Binary files /dev/null and b/cypress_test/data/desktop/example.odt differ
diff --git a/cypress_test/data/desktop/empty.odt
b/cypress_test/data/desktop/shape_operations.odt
similarity index 100%
rename from cypress_test/data/desktop/empty.odt
rename to cypress_test/data/desktop/shape_operations.odt
diff --git a/cypress_test/data/mobile/calc/empty.ods
b/cypress_test/data/mobile/calc/focus.ods
similarity index 100%
rename from cypress_test/data/mobile/calc/empty.ods
rename to cypress_test/data/mobile/calc/focus.ods
diff --git a/cypress_test/data/mobile/impress/empty.odp
b/cypress_test/data/mobile/impress/focus.odp
similarity index 100%
rename from cypress_test/data/mobile/impress/empty.odp
rename to cypress_test/data/mobile/impress/focus.odp
diff --git a/cypress_test/data/mobile/writer/simple.odt
b/cypress_test/data/mobile/writer/apply_font.odt
similarity index 100%
rename from cypress_test/data/mobile/writer/simple.odt
rename to cypress_test/data/mobile/writer/apply_font.odt
diff --git a/cypress_test/data/mobile/writer/apply_paragraph_properties.odt
b/cypress_test/data/mobile/writer/apply_paragraph_properties.odt
new file mode 100644
index 000000000..f7494e82f
Binary files /dev/null and
b/cypress_test/data/mobile/writer/apply_paragraph_properties.odt differ
diff --git a/cypress_test/data/mobile/writer/bottom_toolbar.odt
b/cypress_test/data/mobile/writer/bottom_toolbar.odt
new file mode 100644
index 000000000..f7494e82f
Binary files /dev/null and b/cypress_test/data/mobile/writer/bottom_toolbar.odt
differ
diff --git a/cypress_test/data/mobile/writer/empty.odt
b/cypress_test/data/mobile/writer/focus.odt
similarity index 100%
rename from cypress_test/data/mobile/writer/empty.odt
rename to cypress_test/data/mobile/writer/focus.odt
diff --git a/cypress_test/data/mobile/writer/insert_field.odt
b/cypress_test/data/mobile/writer/insert_field.odt
new file mode 100644
index 000000000..f7494e82f
Binary files /dev/null and b/cypress_test/data/mobile/writer/insert_field.odt
differ
diff --git a/cypress_test/data/mobile/writer/insert_formatting_mark.odt
b/cypress_test/data/mobile/writer/insert_formatting_mark.odt
new file mode 100644
index 000000000..f7494e82f
Binary files /dev/null and
b/cypress_test/data/mobile/writer/insert_formatting_mark.odt differ
diff --git a/cypress_test/data/mobile/writer/insert_object.odt
b/cypress_test/data/mobile/writer/insert_object.odt
new file mode 100644
index 000000000..550752605
Binary files /dev/null and b/cypress_test/data/mobile/writer/insert_object.odt
differ
diff --git a/cypress_test/data/mobile/writer/mobile_wizard_state.odt
b/cypress_test/data/mobile/writer/mobile_wizard_state.odt
new file mode 100644
index 000000000..550752605
Binary files /dev/null and
b/cypress_test/data/mobile/writer/mobile_wizard_state.odt differ
diff --git a/cypress_test/data/mobile/writer/shape_properties.odt
b/cypress_test/data/mobile/writer/shape_properties.odt
new file mode 100644
index 000000000..550752605
Binary files /dev/null and
b/cypress_test/data/mobile/writer/shape_properties.odt differ
diff --git a/cypress_test/data/mobile/writer/spellcheck.odt
b/cypress_test/data/mobile/writer/spellchecking.odt
similarity index 100%
rename from cypress_test/data/mobile/writer/spellcheck.odt
rename to cypress_test/data/mobile/writer/spellchecking.odt
diff --git a/cypress_test/data/mobile/writer/styles.odt
b/cypress_test/data/mobile/writer/styles.odt
new file mode 100644
index 000000000..f7494e82f
Binary files /dev/null and b/cypress_test/data/mobile/writer/styles.odt differ
diff --git a/cypress_test/data/mobile/writer/table_properties.odt
b/cypress_test/data/mobile/writer/table_properties.odt
new file mode 100644
index 000000000..550752605
Binary files /dev/null and
b/cypress_test/data/mobile/writer/table_properties.odt differ
diff --git a/cypress_test/data/mobile/writer/table.odt
b/cypress_test/data/mobile/writer/table_properties2.odt
similarity index 100%
rename from cypress_test/data/mobile/writer/table.odt
rename to cypress_test/data/mobile/writer/table_properties2.odt
diff --git a/cypress_test/data/mobile/writer/toolbar.odt
b/cypress_test/data/mobile/writer/toolbar.odt
new file mode 100644
index 000000000..550752605
Binary files /dev/null and b/cypress_test/data/mobile/writer/toolbar.odt differ
diff --git a/cypress_test/integration_tests/desktop/copy_paste_spec.js
b/cypress_test/integration_tests/desktop/copy_paste_spec.js
index 1f45bc0a7..326cb3297 100644
--- a/cypress_test/integration_tests/desktop/copy_paste_spec.js
+++ b/cypress_test/integration_tests/desktop/copy_paste_spec.js
@@ -4,7 +4,7 @@ var helper = require('../common/helper');
describe('Clipboard operations.', function() {
beforeEach(function() {
- helper.loadTestDoc('simple.odt');
+ helper.loadTestDoc('copy_paste.odt');
});
afterEach(function() {
diff --git
a/cypress_test/integration_tests/desktop/example_desktop_test_spec.js
b/cypress_test/integration_tests/desktop/example_desktop_test_spec.js
index 824656bd2..f709166f6 100644
--- a/cypress_test/integration_tests/desktop/example_desktop_test_spec.js
+++ b/cypress_test/integration_tests/desktop/example_desktop_test_spec.js
@@ -9,7 +9,7 @@ describe('Example test suit 1', function() {
});
it('Example test case 1', function() {
- helper.loadTestDoc('simple.odt');
+ helper.loadTestDoc('example.odt');
// Select a text
cy.get('#document-container').dblclick();
diff --git a/cypress_test/integration_tests/desktop/shape_operations_spec.js
b/cypress_test/integration_tests/desktop/shape_operations_spec.js
index 241af3a33..15869bfe4 100644
--- a/cypress_test/integration_tests/desktop/shape_operations_spec.js
+++ b/cypress_test/integration_tests/desktop/shape_operations_spec.js
@@ -9,7 +9,7 @@ describe('Shape operations', function() {
});
it('Insert a simple shape.', function() {
- helper.loadTestDoc('empty.odt');
+ helper.loadTestDoc('shape_operations.odt');
// Scroll on the up toolbar
cy.get('#toolbar-up .w2ui-scroll-right').click();
diff --git a/cypress_test/integration_tests/mobile/calc/calc_focus_spec.js
b/cypress_test/integration_tests/mobile/calc/calc_focus_spec.js
index 40b6a7c65..8d5cada69 100644
--- a/cypress_test/integration_tests/mobile/calc/calc_focus_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/calc_focus_spec.js
@@ -4,7 +4,7 @@ var helper = require('../../common/helper');
describe('Calc focus tests', function() {
beforeEach(function() {
- helper.beforeAllMobile('empty.ods', 'calc');
+ helper.beforeAllMobile('focus.ods', 'calc');
});
afterEach(function() {
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 9340a6111..61df61095 100644
--- a/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
@@ -4,7 +4,7 @@ var helper = require('../../common/helper');
describe('Impress focus tests', function() {
beforeEach(function() {
- helper.beforeAllMobile('empty.odp', 'impress');
+ helper.beforeAllMobile('focus.odp', 'impress');
});
afterEach(function() {
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 92b62f285..4c38617e9 100644
--- a/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
@@ -4,7 +4,7 @@ var helper = require('../../common/helper');
describe('Apply font changes.', function() {
beforeEach(function() {
- helper.beforeAllMobile('simple.odt', 'writer');
+ helper.beforeAllMobile('apply_font.odt', 'writer');
// Click on edit button
cy.get('#mobile-edit-button').click();
diff --git
a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
index df8cc63a3..ec0dd75ac 100644
---
a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
+++
b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
@@ -4,7 +4,7 @@ var helper = require('../../common/helper');
describe('Apply paragraph properties.', function() {
beforeEach(function() {
- helper.beforeAllMobile('simple.odt', 'writer');
+ helper.beforeAllMobile('apply_paragraph_properties.odt',
'writer');
// Click on edit button
cy.get('#mobile-edit-button').click();
diff --git
a/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js
b/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js
index 6383987b7..9915d7323 100644
--- a/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js
@@ -4,7 +4,7 @@ var helper = require('../../common/helper');
describe('Pushing bottom toolbar items.', function() {
beforeEach(function() {
- helper.beforeAllMobile('simple.odt', 'writer');
+ helper.beforeAllMobile('bottom_toolbar.odt', 'writer');
// Click on edit button
cy.get('#mobile-edit-button').click();
diff --git a/cypress_test/integration_tests/mobile/writer/focus_spec.js
b/cypress_test/integration_tests/mobile/writer/focus_spec.js
index d17302675..b42837f57 100644
--- a/cypress_test/integration_tests/mobile/writer/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/focus_spec.js
@@ -4,7 +4,7 @@ var helper = require('../../common/helper');
describe('Focus tests', function() {
beforeEach(function() {
- helper.beforeAllMobile('empty.odt', 'writer');
+ helper.beforeAllMobile('focus.odt', 'writer');
});
afterEach(function() {
@@ -151,7 +151,7 @@ describe('Focus tests', function() {
.should('be.eq', 'clipboard');
});
- it('Shape related focus.', function() {
+ it.skip('Shape related focus.', function() {
// Click on edit button
cy.get('#mobile-edit-button').click();
diff --git a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
index 91cb9d15c..7f849dd25 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
@@ -4,7 +4,7 @@ var helper = require('../../common/helper');
describe('Insert fields via insertion wizard.', function() {
beforeEach(function() {
- helper.beforeAllMobile('simple.odt', 'writer');
+ helper.beforeAllMobile('insert_field.odt', 'writer');
// Click on edit button
cy.get('#mobile-edit-button').click();
diff --git
a/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
b/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
index 245c3b283..90b6b0d9e 100644
---
a/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
+++
b/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
@@ -4,7 +4,7 @@ var helper = require('../../common/helper');
describe('Insert formatting mark via insertion wizard.', function() {
beforeEach(function() {
- helper.beforeAllMobile('simple.odt', 'writer');
+ helper.beforeAllMobile('insert_formatting_mark.odt', 'writer');
// Click on edit button
cy.get('#mobile-edit-button').click();
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 c8333b221..70d13c570 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
@@ -4,7 +4,7 @@ var helper = require('../../common/helper');
describe('Insert objects via insertion wizard.', function() {
beforeEach(function() {
- helper.beforeAllMobile('empty.odt', 'writer');
+ helper.beforeAllMobile('insert_object.odt', 'writer');
// Click on edit button
cy.get('#mobile-edit-button').click();
diff --git
a/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js
b/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js
index d9c25ecb5..676eb2703 100644
--- a/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js
@@ -4,7 +4,7 @@ var helper = require('../../common/helper');
describe('Mobile wizard state tests', function() {
beforeEach(function() {
- helper.beforeAllMobile('empty.odt', 'writer');
+ helper.beforeAllMobile('mobile_wizard_state.odt', 'writer');
});
afterEach(function() {
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 3b2b182ba..b1121d019 100644
--- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
@@ -4,7 +4,7 @@ var helper = require('../../common/helper');
describe('Change shape properties via mobile wizard.', function() {
beforeEach(function() {
- helper.beforeAllMobile('empty.odt', 'writer');
+ helper.beforeAllMobile('shape_properties.odt', 'writer');
// Click on edit button
cy.get('#mobile-edit-button').click();
@@ -201,7 +201,7 @@ describe('Change shape properties via mobile wizard.',
function() {
.should('have.attr', 'stroke', 'rgb(152,0,0)');
});
- it('Change line style', function() {
+ it.skip('Change line style', function() {
// TODO: Layout of the line properties panel is completely
broken.
if (Cypress.env('LO_CORE_VERSION') === 'master')
return;
diff --git a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
index 3c594e3c8..54a3c5120 100644
--- a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
@@ -4,7 +4,7 @@ var helper = require('../../common/helper');
describe.skip('Spell checking menu.', function() {
beforeEach(function() {
- helper.beforeAllMobile('spellcheck.odt', 'writer');
+ helper.beforeAllMobile('spellchecking.odt', 'writer');
// Click on edit button
cy.get('#mobile-edit-button').click();
diff --git a/cypress_test/integration_tests/mobile/writer/styles_spec.js
b/cypress_test/integration_tests/mobile/writer/styles_spec.js
index 21d0321dd..ec8eb9263 100644
--- a/cypress_test/integration_tests/mobile/writer/styles_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/styles_spec.js
@@ -4,7 +4,7 @@ var helper = require('../../common/helper');
describe('Apply/modify styles.', function() {
beforeEach(function() {
- helper.beforeAllMobile('simple.odt', 'writer');
+ helper.beforeAllMobile('styles.odt', 'writer');
// Click on edit button
cy.get('#mobile-edit-button').click();
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 0e372c22e..837f55d6f 100644
--- a/cypress_test/integration_tests/mobile/writer/table_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/table_properties_spec.js
@@ -4,7 +4,7 @@ var helper = require('../../common/helper');
describe('Change table properties / layout via mobile wizard.', function() {
beforeEach(function() {
- helper.beforeAllMobile('empty.odt', 'writer');
+ helper.beforeAllMobile('table_properties.odt', 'writer');
});
afterEach(function() {
@@ -55,7 +55,7 @@ describe('Change table properties / layout via mobile
wizard.', function() {
if (Cypress.env('LO_CORE_VERSION') === 'master')
return;
- before('table.odt');
+ before('table_properties2.odt');
openTablePanel();
@@ -88,7 +88,7 @@ describe('Change table properties / layout via mobile
wizard.', function() {
if (Cypress.env('LO_CORE_VERSION') === 'master')
return;
- before('table.odt');
+ before('table_properties2.odt');
openTablePanel();
@@ -121,7 +121,7 @@ describe('Change table properties / layout via mobile
wizard.', function() {
if (Cypress.env('LO_CORE_VERSION') === 'master')
return;
- before('table.odt');
+ before('table_properties2.odt');
openTablePanel();
@@ -154,7 +154,7 @@ describe('Change table properties / layout via mobile
wizard.', function() {
if (Cypress.env('LO_CORE_VERSION') === 'master')
return;
- before('table.odt');
+ before('table_properties2.odt');
openTablePanel();
@@ -187,7 +187,7 @@ describe('Change table properties / layout via mobile
wizard.', function() {
if (Cypress.env('LO_CORE_VERSION') === 'master')
return;
- before('table.odt');
+ before('table_properties2.odt');
openTablePanel();
@@ -220,7 +220,7 @@ describe('Change table properties / layout via mobile
wizard.', function() {
if (Cypress.env('LO_CORE_VERSION') === 'master')
return;
- before('table.odt');
+ before('table_properties2.odt');
openTablePanel();
@@ -254,7 +254,7 @@ describe('Change table properties / layout via mobile
wizard.', function() {
if (Cypress.env('LO_CORE_VERSION') === 'master')
return;
- before('table.odt');
+ before('table_properties2.odt');
openTablePanel();
@@ -285,7 +285,7 @@ describe('Change table properties / layout via mobile
wizard.', function() {
if (Cypress.env('LO_CORE_VERSION') === 'master')
return;
- before('table.odt');
+ before('table_properties2.odt');
moveCursorToFirstCell();
@@ -317,7 +317,7 @@ describe('Change table properties / layout via mobile
wizard.', function() {
if (Cypress.env('LO_CORE_VERSION') === 'master')
return;
- before('table.odt');
+ before('table_properties2.odt');
openTablePanel();
@@ -349,7 +349,7 @@ describe('Change table properties / layout via mobile
wizard.', function() {
if (Cypress.env('LO_CORE_VERSION') === 'master')
return;
- before('table.odt');
+ before('table_properties2.odt');
openTablePanel();
diff --git a/cypress_test/integration_tests/mobile/writer/toolbar_spec.js
b/cypress_test/integration_tests/mobile/writer/toolbar_spec.js
index a0e935405..baef8f820 100644
--- a/cypress_test/integration_tests/mobile/writer/toolbar_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/toolbar_spec.js
@@ -4,7 +4,7 @@ var helper = require('../../common/helper');
describe('Toolbar tests', function() {
beforeEach(function() {
- helper.beforeAllMobile('empty.odt', 'writer');
+ helper.beforeAllMobile('toolbar.odt', 'writer');
});
afterEach(function() {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
