fix path part 2

owncloud · Nov 17, 2021 · 0f07a0b · 0f07a0b
1 parent e1426da
commit 0f07a0b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/settings/nightwatch.conf.js b/settings/nightwatch.conf.js
@@ -1,5 +1,4 @@
 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(TEST_INFRA_DIRECTORY, 'nightwatch.conf.js'))

diff --git a/settings/package.json b/settings/package.json
@@ -12,7 +12,7 @@
   "license": "Apache-2.0",
   "author": "ownCloud GmbH <[email protected]>",
   "scripts": {
-    "acceptance-tests": "echo ${TEST_INFRA_DIRECTORY}/stepDefinitions; cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require ${TEST_INFRA_DIRECTORY}/setup.js --require ui/tests/acceptance/stepDefinitions --require ${TEST_INFRA_DIRECTORY}/stepDefinitions --format @cucumber/pretty-formatter -t \"${TEST_TAGS:-not @skip and not @skipOnOC10}\"",
+    "acceptance-tests": "cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require ${TEST_INFRA_DIRECTORY}/setup.js --require ui/tests/acceptance/stepDefinitions --require ${TEST_INFRA_DIRECTORY}/stepDefinitions --format @cucumber/pretty-formatter -t \"${TEST_TAGS:-not @skip and not @skipOnOC10}\"",
     "build": "rollup -c",
     "generate-api": "node node_modules/swagger-vue-generator/bin/generate-api.js --package-version v0 --source pkg/proto/v0/settings.swagger.json --moduleName settings --destination ui/client/settings/index.js",
     "lint": "eslint ui/**/*.vue ui/**/*.js --color --global requirejs --global require",

diff --git a/settings/ui/tests/run-acceptance-test.sh b/settings/ui/tests/run-acceptance-test.sh
@@ -18,7 +18,7 @@ then
 	exit 1
 fi
 
-#trap clean_up SIGHUP SIGINT SIGTERM
+trap clean_up SIGHUP SIGINT SIGTERM
 
 if [ -z "$TEST_INFRA_DIRECTORY" ]
 then
@@ -40,10 +40,7 @@ clean_up() {
 
 trap clean_up SIGHUP SIGINT SIGTERM EXIT
 
-cp -r "$WEB_PATH"/tests/acceptance/* "$testFolder"
-rm -r $testFolder/node_modules
-
-yarn install --immutable
+cp -r $(ls -d "$WEB_PATH"/tests/acceptance/* | grep -v 'node_modules') "$testFolder"
 
 export SERVER_HOST=${SERVER_HOST:-https://localhost:9200}
 export BACKEND_HOST=${BACKEND_HOST:-https://localhost:9200}