cypress_test/Makefile.am | 10 +++-------
cypress_test/package.json | 2 +-
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit cfc62f864dfbea8e39ac053f37489b3e745485a2
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Mon Aug 10 14:51:53 2020 +0200
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Mon Aug 10 15:37:46 2020 +0200
cypress: use actual LOOLWSD version hash.
The related issue was fixed upstream.
Change-Id: I8b1191d3c0d5543233ace9322a7d768b3424d62d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100435
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 0c343e9eb..230f8dc7d 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -52,10 +52,6 @@ FILTER_DEBUG=cypress:electron,cypress:launcher
export DEBUG=$(if $(ENABLE_LOGGING),$(FILTER_DEBUG),)
endif
-# We use a hard coded hash here, because of this issue:
-# https://github.com/cypress-io/cypress/issues/6891
-WSD_VERSION_HASH := "11111111"
-
if HAVE_LO_PATH
MOBILE_TEST_FILES=$(subst $(MOBILE_TEST_FOLDER)/,,$(wildcard
$(MOBILE_TEST_FOLDER)/*_spec.js) $(wildcard $(MOBILE_TEST_FOLDER)/*/*_spec.js))
@@ -249,19 +245,19 @@ DESKTOP_CONFIG = \
integrationFolder=$(DESKTOP_TEST_FOLDER),supportFile=$(SUPPORT_FILE),userAgent=$(DESKTOP_USER_AGENT)
DESKTOP_ENV = \
-
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(WSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)"
+
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)"
MOBILE_CONFIG = \
integrationFolder=$(MOBILE_TEST_FOLDER),supportFile=$(SUPPORT_FILE),userAgent=$(MOBILE_USER_AGENT)
MOBILE_ENV = \
-
DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(WSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)"
+
DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)"
MULTIUSER_CONFIG = \
integrationFolder=$(MULTIUSER_TEST_FOLDER),supportFile=$(SUPPORT_FILE),userAgent=$(DESKTOP_USER_AGENT),defaultCommandTimeout=30000
MULTIUSER_ENV = \
-
DATA_FOLDER=$(MULTIUSER_DATA_FOLDER),WORKDIR=$(MULTIUSER_WORKDIR),WSD_VERSION_HASH=$(WSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)"
+
DATA_FOLDER=$(MULTIUSER_DATA_FOLDER),WORKDIR=$(MULTIUSER_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)"
define run_interactive_desktop
$(if $(1),\
commit 76c2481190df40d040107f30a0f5b2b45aa8ce7d
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Mon Aug 10 14:10:33 2020 +0200
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Mon Aug 10 15:37:37 2020 +0200
update cypress: 4.9.0 -> 4.12.1.
Change-Id: I97e94f32697cac9002aa34632b6a80f8c6a0e127
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100434
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
diff --git a/cypress_test/package.json b/cypress_test/package.json
index 176b2ea0d..1e29462ed 100644
--- a/cypress_test/package.json
+++ b/cypress_test/package.json
@@ -4,7 +4,7 @@
"description": "Cypress integration test suit",
"license": "MPL-2.0",
"dependencies": {
- "cypress": "4.9.0",
+ "cypress": "4.12.1",
"cypress-failed-log": "2.7.0",
"cypress-file-upload": "4.0.7",
"cypress-log-to-output": "1.0.8",
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
