Adapt scripts

owncloud · Jan 4, 2021 · dbe9975 · dbe9975
1 parent a5148e7
commit dbe9975
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -10,16 +10,17 @@
   "scripts": {
     "build": "rollup -c",
     "build:w": "rollup -c -w",
-    "docker:ldap": "docker run --rm -d -p 127.0.0.1:389:389 -p 636:636 --hostname ldap.my-company.com -e LDAP_TLS_VERIFY_CLIENT=never -e LDAP_DOMAIN=owncloud.com -e LDAP_ORGANISATION=ownCloud -e LDAP_ADMIN_PASSWORD=admin --name web-tests-slapd osixia/openldap",
     "docker:redis": "docker run --rm -d -p 6379:6379 -e REDIS_DATABASES=1 --name web-tests-redis webhippie/redis:latest",
     "docker:selenium": "docker run --rm -d --network=\"host\" -v /dev/shm:/dev/shm -v ${REMOTE_UPLOAD_DIR:-$PWD/tests/acceptance/filesForUpload}:${LOCAL_UPLOAD_DIR:-/uploads}:ro --name web-tests-selenium selenium/standalone-chrome-debug",
     "docker:selenium:mac": "docker run --rm -d -p ${SELENIUM_PORT:-4444}:4444 -p 5900:5900 -v /dev/shm:/dev/shm -v ${REMOTE_UPLOAD_DIR:-$PWD/tests/acceptance/filesForUpload}:${LOCAL_UPLOAD_DIR:-/uploads}:ro --name web-tests-selenium selenium/standalone-chrome-debug",
+    "docker:kill": "docker kill web-tests-redis web-tests-selenium",
     "lint": "eslint packages/*/src tests --ext vue --ext js --color",
     "lint:fix": "eslint packages/*/src tests --ext vue --ext js --color --fix",
-    "test:acceptance": "cucumber-js --require-module @babel/register --require-module @babel/polyfill --require tests/acceptance/setup.js --require tests/acceptance/stepDefinitions --format node_modules/cucumber-pretty -t \"${TEST_TAGS:-not @skip and not @skipOnOC10}\"",
-    "test:acceptance:drone": "cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require tests/acceptance/setup.js --require tests/acceptance/stepDefinitions --format node_modules/cucumber-pretty ${TEST_PATHS:-tests/acceptance/features/$TEST_CONTEXT} -t \"${TEST_TAGS}\"",
-    "test:acceptance:ldap": "RUN_ON_OCIS=true RUN_WITH_LDAP=true cucumber-js --require-module @babel/register --require-module @babel/polyfill --require tests/acceptance/setup.js --require tests/acceptance/stepDefinitions --format node_modules/cucumber-pretty -t \"${TEST_TAGS:-not @skip and not @skipOnOCIS and not @notToImplementOnOCIS}\"",
+    "test:acceptance:prepare": "yarn docker:redis; yarn docker:selenium; yarn dep:test:app",
+    "test:acceptance:prepare:mac": "yarn docker:redis; yarn docker:selenium:mac; yarn dep:test:app",
+    "test:acceptance:oc10": "cucumber-js --require-module @babel/register --require-module @babel/polyfill --require tests/acceptance/setup.js --require tests/acceptance/stepDefinitions --format node_modules/cucumber-pretty -t \"${TEST_TAGS:-not @skip and not @skipOnOC10}\"",
     "test:acceptance:ocis": "NODE_TLS_REJECT_UNAUTHORIZED=0 RUN_ON_OCIS=true cucumber-js --require-module @babel/register --require-module @babel/polyfill --require tests/acceptance/setup.js --require tests/acceptance/stepDefinitions --format node_modules/cucumber-pretty -t \"${TEST_TAGS:-not @skip and not @skipOnOCIS and not @notToImplementOnOCIS}\"",
+    "test:acceptance:drone": "cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require tests/acceptance/setup.js --require tests/acceptance/stepDefinitions --format node_modules/cucumber-pretty ${TEST_PATHS:-tests/acceptance/features/$TEST_CONTEXT} -t \"${TEST_TAGS}\"",
     "test:accessibility": "node node_modules/axe-cli/axe-cli --exit --disable page-has-heading-one,meta-viewport",
     "dep:test:app": "if [ -d tests/testing-app ]; then (cd tests/testing-app && git pull && pwd); else git clone --depth 1 https://github.com/owncloud/testing.git tests/testing-app; fi;"
   },