[Libreoffice-commits] online.git: 2 commits - cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/common/helper.js |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9d51a1dc3f1d8d114b8e38fa8a00d6e33ea9f74b
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Wed Aug 5 04:14:36 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Wed Aug 5 13:40:24 2020 +0200

    Fix typo.
    
    Change-Id: I78aa76ece24c22f19f1687d350e0687b59fff95c
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100164
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/integration_tests/common/helper.js b/cypress_test/integration_tests/common/helper.js
index 303cbcc13..484b8cad0 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -159,8 +159,8 @@ function matchClipboardText(regexp) {
 	});
 }
 
-function beforeAll(fileName, subFolder, noFileCop) {
-	loadTestDoc(fileName, subFolder, noFileCop);
+function beforeAll(fileName, subFolder, noFileCopy) {
+	loadTestDoc(fileName, subFolder, noFileCopy);
 }
 
 function afterAll(fileName) {
commit 3f55e78f46e94f81a86bee9bb19cc11f4366bffb
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Aug 4 17:42:32 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Wed Aug 5 13:40:14 2020 +0200

    cypress: make this custom timeout also relative to the default value.
    
    Change-Id: I9a8dcd68c31ecd57d8d8fec880dd74e99d922b96
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100163
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/integration_tests/common/helper.js b/cypress_test/integration_tests/common/helper.js
index d35637a16..303cbcc13 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -54,7 +54,7 @@ function loadTestDoc(fileName, subFolder, noFileCopy) {
 		}});
 
 	// Wait for the document to fully load
-	cy.get('.leaflet-tile-loaded', {timeout : 10000});
+	cy.get('.leaflet-tile-loaded', {timeout : Cypress.config('defaultCommandTimeout') * 2.0});
 
 	cy.log('Loading test document - end.');
 }