Install web acceptance test dependencies for web, accounts, settins

owncloud · Nov 16, 2021 · c7cdccf · c7cdccf
1 parent f13ccb1
commit c7cdccf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.drone.star b/.drone.star
@@ -625,7 +625,9 @@ def uiTestPipeline(ctx, filterTags, early_fail, runPart = 1, numberOfParts = 1,
                     "cp -r tests/acceptance/filesForUpload/* /uploads",
                     "yarn install --immutable",
                     "yarn build",
-                    "./tests/acceptance/run.sh",
+                    "cd tests/acceptance/",
+                    "yarn install --immutable",
+                    "./run.sh",
                 ],
                 "volumes": [stepVolumeOC10Tests] +
                            [{
@@ -688,6 +690,8 @@ def accountsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4):
                     "cp -r tests/acceptance/filesForUpload/* /uploads",
                     "yarn install --immutable",
                     "yarn build",
+                    "cd tests/acceptance/",
+                    "yarn install --immutable",
                     "cd /drone/src/accounts",
                     "yarn install --immutable",
                     "make test-acceptance-webui",
@@ -751,6 +755,9 @@ def settingsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4):
                     "cd /srv/app/web",
                     "git checkout $WEB_COMMITID",
                     "yarn install --immutable",
+                    "yarn build",
+                    "cd tests/acceptance/",
+                    "yarn install --immutable",
                     "cd /drone/src/settings",
                     "yarn install --immutable",
                     "make test-acceptance-webui",

diff --git a/accounts/nightwatch.conf.js b/accounts/nightwatch.conf.js
@@ -1,7 +1,7 @@
 const path = require('path')
 const WEB_PATH = process.env.WEB_PATH
 
-const config = require(path.join(WEB_PATH, 'nightwatch.conf.js'))
+const config = require(path.join(WEB_PATH, 'tests/acceptance/nightwatch.conf.js'))
 
 config.page_objects_path = [WEB_PATH + '/tests/acceptance/pageObjects', 'ui/tests/acceptance/pageobjects']
 config.custom_commands_path = WEB_PATH + '/tests/acceptance/customCommands'

diff --git a/settings/nightwatch.conf.js b/settings/nightwatch.conf.js
@@ -2,7 +2,7 @@ const path = require('path')
 const WEB_PATH = process.env.WEB_PATH
 const TEST_INFRA_DIRECTORY = process.env.TEST_INFRA_DIRECTORY
 
-const config = require(path.join(WEB_PATH, 'nightwatch.conf.js'))
+const config = require(path.join(WEB_PATH, 'tests/acceptance/nightwatch.conf.js'))
 
 config.page_objects_path = [TEST_INFRA_DIRECTORY + '/acceptance/pageObjects', 'ui/tests/acceptance/pageobjects']
 config.custom_commands_path = TEST_INFRA_DIRECTORY + '/acceptance/customCommands'