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

[Tamás Zolnai (via logerrit)]

 cypress_test/.gitignore                                            |    1 +
 cypress_test/integration_tests/mobile/writer/insert_object_spec.js |    2 ++
 cypress_test/support/commands.js                                   |    1 -
 cypress_test/support/index.js                                      |    1 -
 4 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 82f022d8b9d3cfda2465ca46c854af1f64d17dd9
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Wed Apr 8 10:34:31 2020 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Wed Apr 8 11:11:31 2020 +0200

    cypress: try to fix TypeError: cy.waitUntil is not a function.
    
    Import cypress-wait-until directly in the test file. This module
    is not intended to use everywhere, so it's not a big issue
    if we need to import it before use.
    
    Change-Id: I33ff8ae1eae2ec124b286cd7760d5571e5c67531
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91874
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/.gitignore b/cypress_test/.gitignore
index 3e5e8dbd2..0b6b5b539 100644
--- a/cypress_test/.gitignore
+++ b/cypress_test/.gitignore
@@ -2,3 +2,4 @@ node_modules
 cypress
 package-lock.json
 workdir
+support/commands.js
diff --git a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
index ab938168f..338230b44 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
@@ -1,5 +1,7 @@
 /* global describe it cy beforeEach require expect afterEach Cypress*/
 
+import 'cypress-wait-until';
+
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
 var writerHelper = require('./writer_helper');
diff --git a/cypress_test/support/commands.js b/cypress_test/support/commands.js
deleted file mode 100644
index 5c6c3cd80..000000000
--- a/cypress_test/support/commands.js
+++ /dev/null
@@ -1 +0,0 @@
-import 'cypress-wait-until';
diff --git a/cypress_test/support/index.js b/cypress_test/support/index.js
index 1c6833720..8f683db34 100644
--- a/cypress_test/support/index.js
+++ b/cypress_test/support/index.js
@@ -1,4 +1,3 @@
 /* global require */
 
 require('cypress-failed-log');
-import './commands';