cypress_test/Makefile.am | 18
----------
cypress_test/README | 13
+++++++
cypress_test/integration_tests/mobile/writer/shape_properties_spec.js | 2 -
3 files changed, 15 insertions(+), 18 deletions(-)
New commits:
commit 9136bda96eac4ba1c4374a9bcd0459a46bc32713
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Mon Aug 31 15:06:44 2020 +0200
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Mon Aug 31 15:40:54 2020 +0200
cypress: use nonambiguous line style here.
Change-Id: I8679fb78a2af530692e91a84bacf2879506848ab
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101735
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
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 9cf50d0bb..e9457a3e9 100644
--- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
@@ -195,7 +195,7 @@ describe('Change shape properties via mobile wizard.',
function() {
helper.clickOnIdle('#linestyle');
- helper.clickOnIdle('.ui-combobox-text', 'Dashed');
+ helper.clickOnIdle('.ui-combobox-text', 'Ultrafine Dashed');
triggerNewSVG();
commit d6005f09476bc7071317f65823436ff4c4f234c6
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Mon Aug 31 14:38:59 2020 +0200
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Mon Aug 31 15:40:44 2020 +0200
cypress: add a way to run tests with different browsers.
e.g. CYPRESS_BROWSER="firefox" make check
Change-Id: I3017179152c6e875df667da5081abb0c8cde60b1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101733
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 4ab2d2b61..e0679bf7b 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -47,7 +47,7 @@ SPACE :=$(EMPTY) $(EMPTY)
CORE_VERSION := $(subst $(SPACE),_,$(shell "@LO_PATH@"/program/soffice.bin
--version 2> /dev/null))
-BROWSER:=$(CHROME)
+BROWSER:=$(if $(shell echo $$CYPRESS_BROWSER),$(shell echo
$$CYPRESS_BROWSER),$(CHROME))
if ENABLE_DEBUG
FILTER_DEBUG=cypress:electron,cypress:launcher
@@ -205,22 +205,6 @@ do-run-cov: @JAILS_PATH@ $(NODE_BINS)
$(call run_all_multiuser_tests,COVERAGE_RUN="1")
@$(KILL_COMMAND) || true
-
-check-firefox: do-check-firefox
- $(if $(wildcard $(ERROR_LOG)),@cat $(ERROR_LOG))
-
-do-check-firefox: @JAILS_PATH@ $(NODE_BINS)
- @echo
- @echo "Run tests inside Firefox..."
- @echo
- @rm -f $(ERROR_LOG)
- $(eval BROWSER="firefox")
- $(call start_loolwsd)
- $(call run_desktop_tests)
- $(call run_mobile_tests)
- $(call run_all_multiuser_tests)
- @$(KILL_COMMAND) || true
-
@JAILS_PATH@:
mkdir -p $@
diff --git a/cypress_test/README b/cypress_test/README
index fcf3cc0ed..a7cc3a0fc 100644
--- a/cypress_test/README
+++ b/cypress_test/README
@@ -115,6 +115,19 @@ mobile and desktop tests, that's why there are two
separate commands
for them and there is no option to open all the tests in the
test runner.
+Running tests in different browsers
+-----------------------------------
+
+By default, the tests are run with chrome / chromium. If you need to
+run the tests with a different browser, you can use the CYPRESS_BROWSER
+variable:
+
+CYPRESS_BROWSER="firefox" make check
+
+This variable can be set to any value which is accepted by cypress
+--browser command line argument:
+https://docs.cypress.io/guides/guides/command-line.html#cypress-run-browser-lt-browser-name-or-path-gt
+
Known issues
------------
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
