[Libreoffice-commits] online.git: 2 commits - cypress_test/package.json cypress_test/support

[Tamás Zolnai (via logerrit)]

 cypress_test/package.json     |    4 ++--
 cypress_test/support/index.js |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 03a65ba7f179baa102e9420382a2b96a2ea2cb14
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Sep 17 14:56:58 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Sep 18 12:50:04 2020 +0200

    update cypress-file-upload: 4.0.7 -> 4.1.1
    
    Change-Id: I312aa63f0fe394032fe06e9248a5a4da9eec6de1
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102992
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/package.json b/cypress_test/package.json
index 1380e75a4..a35e6347d 100644
--- a/cypress_test/package.json
+++ b/cypress_test/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "cypress": "5.1.0",
     "cypress-failed-log": "2.7.0",
-    "cypress-file-upload": "4.0.7",
+    "cypress-file-upload": "4.1.1",
     "cypress-log-to-output": "1.0.8",
     "cypress-select-tests": "1.5.7",
     "cypress-wait-until": "1.7.1",
commit 5b1b66ac512da3b77101b6610d3c185ef24f9717
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Sep 17 14:55:03 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Sep 18 12:49:59 2020 +0200

    update cypress: 4.12.1 -> 5.1.0
    
    * Fixes random failures in interactive test runner.
    * Introduces test retries, what we did with an own script so far.
    
    Change-Id: Iab5c32e854618a694e7d10d3c92c1c6c32465983
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102991
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/package.json b/cypress_test/package.json
index 1e29462ed..1380e75a4 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.12.1",
+    "cypress": "5.1.0",
     "cypress-failed-log": "2.7.0",
     "cypress-file-upload": "4.0.7",
     "cypress-log-to-output": "1.0.8",
diff --git a/cypress_test/support/index.js b/cypress_test/support/index.js
index 26bed2b2b..afcf97689 100644
--- a/cypress_test/support/index.js
+++ b/cypress_test/support/index.js
@@ -4,7 +4,7 @@ require('cypress-failed-log');
 
 if (Cypress.env('INTEGRATION') === 'php-proxy') {
 	Cypress.Server.defaults({
-		whitelist: function() {
+		ignore: function() {
 			return true;
 		}
 	});