cypress: move includes of 3rd-party packages to support file.

Now we handle support file better for parallel test run too:
a13b1a93bca1a6fe4ef0efc11156974ebb66a29f

Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I4a88f815ddb1c4d79042134cc07e0c418d4ea10f

13 files changed, 3 insertions, 26 deletions

diff --git a/cypress_test/integration_tests/common/calc_helper.js b/cypress_test/integration_tests/common/calc_helper.js
index 8f37ac4710..a735172b60 100644
--- a/cypress_test/integration_tests/common/calc_helper.js
+++ b/cypress_test/integration_tests/common/calc_helper.js
@@ -1,7 +1,5 @@
 /* global cy expect Cypress require */
 
-require('cypress-wait-until');
-
 var helper = require('./helper');
 
 // Click on the formula bar.
diff --git a/cypress_test/integration_tests/common/helper.js b/cypress_test/integration_tests/common/helper.js
index 671b8939dc..8a2dfb12fe 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -1,7 +1,4 @@
-/* global cy Cypress expect require */
-
-require('cypress-wait-until');
-require('cypress-file-upload');
+/* global cy Cypress expect */
 
 var mobileWizardIdleTime = 1250;
 
diff --git a/cypress_test/integration_tests/common/impress_helper.js b/cypress_test/integration_tests/common/impress_helper.js
index 56ba87f0c1..2254face6a 100644
--- a/cypress_test/integration_tests/common/impress_helper.js
+++ b/cypress_test/integration_tests/common/impress_helper.js
@@ -1,7 +1,5 @@
 /* global cy require expect */
 
-require('cypress-wait-until');
-
 var helper = require('./helper');
 
 // Assert that Impress is *not* in Text Edit Mode.
diff --git a/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js b/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js
index b28980c60d..bc4ca587cb 100644
--- a/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js
@@ -1,7 +1,5 @@
 /* global describe it cy beforeEach require afterEach Cypress */
 
-require('cypress-file-upload');
-
 var helper = require('../../common/helper');
 var desktopHelper = require('../../common/desktop_helper');
 var writerHelper = require('../../common/writer_helper');
diff --git a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
index c73582836c..fd1315fe68 100644
--- a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
@@ -5,8 +5,6 @@ var calcHelper = require('../../common/calc_helper');
 var mobileHelper = require('../../common/mobile_helper');
 var calcMobileHelper = require('./calc_mobile_helper');
 
-require('cypress-wait-until');
-
 describe('Change alignment settings.', function() {
 	var testFileName = 'alignment_options.ods';
 
diff --git a/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js b/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js
index bb63767d97..f92769be8a 100644
--- a/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js
@@ -5,8 +5,6 @@ var calcHelper = require('../../common/calc_helper');
 var mobileHelper = require('../../common/mobile_helper');
 var calcMobileHelper = require('./calc_mobile_helper');
 
-require('cypress-wait-until');
-
 describe('Interact with bottom toolbar.', function() {
 	var testFileName;
 
diff --git a/cypress_test/integration_tests/mobile/calc/chart_spec.js b/cypress_test/integration_tests/mobile/calc/chart_spec.js
index e70808606d..4ad9f5698e 100644
--- a/cypress_test/integration_tests/mobile/calc/chart_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/chart_spec.js
@@ -1,7 +1,5 @@
 /* global describe it cy beforeEach require afterEach expect*/
 
-require('cypress-wait-until');
-
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
 var calcMobileHelper = require('./calc_mobile_helper');
diff --git a/cypress_test/integration_tests/mobile/calc/formulabar_spec.js b/cypress_test/integration_tests/mobile/calc/formulabar_spec.js
index 2973b45591..e9335cda1b 100644
--- a/cypress_test/integration_tests/mobile/calc/formulabar_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/formulabar_spec.js
@@ -4,8 +4,6 @@ var helper = require('../../common/helper');
 var calcHelper = require('../../common/calc_helper');
 var mobileHelper = require('../../common/mobile_helper');
 
-require('cypress-wait-until');
-
 describe('Change alignment settings.', function() {
 	var testFileName = 'formulabar.ods';
 
diff --git a/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js b/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
index 7613d501bd..91c8d3da4c 100644
--- a/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
@@ -1,7 +1,5 @@
 /* global describe it cy beforeEach require afterEach expect*/
 
-require('cypress-file-upload');
-
 var helper = require('../../common/helper');
 var calcHelper = require('../../common/calc_helper');
 var mobileHelper = require('../../common/mobile_helper');
diff --git a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
index bdfdc49333..4918c1b000 100644
--- a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
@@ -1,7 +1,5 @@
 /* global describe it cy beforeEach require expect afterEach Cypress*/
 
-require('cypress-file-upload');
-
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
 var impressHelper = require('../../common/impress_helper');
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 0e5e03dc62..17fc26b4a8 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
@@ -1,7 +1,5 @@
 /* global describe it cy beforeEach require expect afterEach */
 
-require('cypress-file-upload');
-
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
 var writerHelper = require('../../common/writer_helper');
diff --git a/cypress_test/integration_tests/multiuser/interference_user_spec.js b/cypress_test/integration_tests/multiuser/interference_user_spec.js
index d81d81fc29..f3ef65f2f1 100644
--- a/cypress_test/integration_tests/multiuser/interference_user_spec.js
+++ b/cypress_test/integration_tests/multiuser/interference_user_spec.js
@@ -1,7 +1,5 @@
 /* global describe it cy require Cypress */
 
-require('cypress-wait-until');
-
 var helper = require('../common/helper');
 var mobileHelper = require('../common/mobile_helper');
 var calcHelper = require('../common/calc_helper');
diff --git a/cypress_test/support/index.js b/cypress_test/support/index.js
index da5185f695..fbddd12621 100644
--- a/cypress_test/support/index.js
+++ b/cypress_test/support/index.js
@@ -1,6 +1,8 @@
 /* global require Cypress Promise */
 
 require('cypress-failed-log');
+require('cypress-wait-until');
+require('cypress-file-upload');
 
 if (Cypress.env('INTEGRATION') === 'php-proxy') {
 	Cypress.Server.defaults({