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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/common/helper.js |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 95fbcdebed842b4fcd3712ccd7fa80b70f4f35fb
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Sat Sep 19 20:04:07 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Sun Sep 20 14:23:08 2020 +0200

    cypress: fix stopping test run in interactive test runner.
    
    I reported the issue. Let's have a workaround until,
    the bug fix is released.
    
    Change-Id: I7d7719d311e0c0584b7d6e710286f28962d00a96
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103038
    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 113ee79ee..f748b9bde 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -328,6 +328,10 @@ function beforeAll(fileName, subFolder, noFileCopy) {
 function afterAll(fileName) {
 	cy.log('Waiting for closing the document - start.');
 
+	//https://github.com/cypress-io/cypress/issues/8621
+	if (Cypress.mocha.getRunner().stopped)
+		return;
+
 	if (Cypress.env('INTEGRATION') === 'nextcloud') {
 		if (Cypress.env('WITHIN_IFRAME') === 'TRUE') {
 			// Close the document