diff --git a/.drone.star b/.drone.star index 1ace7ef09..15b7088ac 100644 --- a/.drone.star +++ b/.drone.star @@ -408,7 +408,7 @@ def localApiTests(ctx, coreBranch = 'master', coreCommit = '', storage = 'ownclo 'PATH_TO_CORE': '/srv/app/testrunner', }, 'commands': [ - 'make -C ocis test-acceptance-api', + 'make test-acceptance-api', ], 'volumes': [{ 'name': 'gopath', @@ -461,7 +461,7 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n 'BEHAT_FILTER_TAGS': '~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@local_storage&&~@skipOnOcis-%s-Storage' % ('OC' if storage == 'owncloud' else 'OCIS'), 'DIVIDE_INTO_NUM_PARTS': number_of_parts, 'RUN_PART': part_number, - 'EXPECTED_FAILURES_FILE': '/drone/src/ocis/tests/acceptance/expected-failures-on-%s-storage.txt' % (storage.upper()), + 'EXPECTED_FAILURES_FILE': '/drone/src/tests/acceptance/expected-failures-on-%s-storage.txt' % (storage.upper()), }, 'commands': [ 'make -C /srv/app/testrunner test-acceptance-api', @@ -525,7 +525,7 @@ def uiTestPipeline(suiteName, phoenixBranch = 'master', phoenixCommit = '', stor 'RUN_ON_OCIS': 'true', 'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/ocis/owncloud/data', 'OCIS_SKELETON_DIR': '/srv/app/testing/data/webUISkeleton', - 'PHOENIX_CONFIG': '/drone/src/ocis/tests/config/drone/ocis-config.json', + 'PHOENIX_CONFIG': '/drone/src/tests/config/drone/ocis-config.json', 'TEST_TAGS': 'not @skipOnOCIS and not @skip', 'LOCAL_UPLOAD_DIR': '/uploads', 'NODE_TLS_REJECT_UNAUTHORIZED': 0, @@ -597,7 +597,7 @@ def accountsUITests(ctx, phoenixBranch, phoenixCommit, storage = 'owncloud', acc 'RUN_ON_OCIS': 'true', 'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/ocis/owncloud/data', 'OCIS_SKELETON_DIR': '/srv/app/testing/data/webUISkeleton', - 'PHOENIX_CONFIG': '/drone/src/ocis/tests/config/drone/ocis-config.json', + 'PHOENIX_CONFIG': '/drone/src/tests/config/drone/ocis-config.json', 'TEST_TAGS': 'not @skipOnOCIS and not @skip', 'LOCAL_UPLOAD_DIR': '/uploads', 'NODE_TLS_REJECT_UNAUTHORIZED': 0, @@ -1447,8 +1447,8 @@ def ocisServer(storage, accounts_hash_difficulty = 4): 'STORAGE_FRONTEND_PUBLIC_URL': 'https://ocis-server:9200', 'STORAGE_SHARING_USER_JSON_FILE': '/srv/app/tmp/ocis/shares.json', 'PROXY_ENABLE_BASIC_AUTH': True, - 'PHOENIX_WEB_CONFIG': '/drone/src/ocis/tests/config/drone/ocis-config.json', - 'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/ocis/tests/config/drone/identifier-registration.yml', + 'PHOENIX_WEB_CONFIG': '/drone/src/tests/config/drone/ocis-config.json', + 'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/tests/config/drone/identifier-registration.yml', 'KONNECTD_ISS': 'https://ocis-server:9200', 'KONNECTD_TLS': 'true', } diff --git a/.gitignore b/.gitignore index 7f3aa9cbe..42c117c64 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,10 @@ node_modules/ */yarn-error.log # Konnectd -konnectd/assets/identifier \ No newline at end of file +konnectd/assets/identifier + +# Composer - used for API acceptance tests +composer.lock +vendor +vendor-bin/**/vendor +vendor-bin/**/composer.lock diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..5ec82fbde --- /dev/null +++ b/Makefile @@ -0,0 +1,33 @@ +SHELL := bash + +.PHONY: help +help: + @echo "Please use 'make ' where is one of the following:" + @echo + @echo -e "Testing:\n" + @echo -e "make test-acceptance-api\trun API acceptance tests" + @echo -e "make clean-tests\t\tdelete API tests framework dependencies" + @echo + @echo -e "See the Makefile in the ocis folder for other build and test targets" + +.PHONY: clean-tests +clean-tests: + rm -Rf vendor-bin/**/vendor vendor-bin/**/composer.lock + +BEHAT_BIN=vendor-bin/behat/vendor/bin/behat + +.PHONY: test-acceptance-api +test-acceptance-api: vendor-bin/behat/vendor + BEHAT_BIN=$(BEHAT_BIN) $(PATH_TO_CORE)/tests/acceptance/run.sh --remote --type api + +vendor/bamarni/composer-bin-plugin: composer.lock + composer install + +vendor-bin/behat/vendor: vendor/bamarni/composer-bin-plugin vendor-bin/behat/composer.lock + composer bin behat install --no-progress + +vendor-bin/behat/composer.lock: vendor-bin/behat/composer.json + @echo behat composer.lock is not up to date. + +composer.lock: composer.json + @echo composer.lock is not up to date. diff --git a/ocis/composer.json b/composer.json similarity index 100% rename from ocis/composer.json rename to composer.json diff --git a/docs/ocis/development/testing.md b/docs/ocis/development/testing.md index cdd7cd8e0..3fb3d2558 100644 --- a/docs/ocis/development/testing.md +++ b/docs/ocis/development/testing.md @@ -42,7 +42,7 @@ In the ownCloud 10 core clone the testing app with the following command: git clone https://github.com/owncloud/testing apps/testing ``` -Then run the api acceptance tests with the following command inside the `./ocis` directory: +Then run the api acceptance tests with the following command from the root of the OCIS repo: ``` make test-acceptance-api \ TEST_SERVER_URL=https://localhost:9200 \ @@ -61,14 +61,14 @@ To run a single test add `BEHAT_FEATURE=` ### use existing tests for BDD As a lot of scenarios are written for oC10, we can use those tests for Behaviour driven development in ocis. -Every scenario that does not work in OCIS with "owncloud" storage, is listed in `ocis/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt` with a link to the related issue. -Every scenario that does not work in OCIS with "ocis" storage, is listed in `ocis/tests/acceptance/expected-failures-on-OCIS-storage.txt` with a link to the related issue. +Every scenario that does not work in OCIS with "owncloud" storage, is listed in `tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt` with a link to the related issue. +Every scenario that does not work in OCIS with "ocis" storage, is listed in `tests/acceptance/expected-failures-on-OCIS-storage.txt` with a link to the related issue. Those scenarios are run in the ordinary acceptance test pipeline in CI. The scenarios that fail are checked against the expected failures. If there are any differences then the CI pipeline fails. -Similarly, scenarios that do not work in OCIS with EOS storage are listed in `ocis/tests/acceptance/expected-failures-on-EOS-storage.txt`. +Similarly, scenarios that do not work in OCIS with EOS storage are listed in `tests/acceptance/expected-failures-on-EOS-storage.txt`. Additionally, some issues have scenarios that demonstrate the current buggy behaviour in ocis(reva). -Those scenarios are in this ocis repository in `ocis/tests/acceptance/features/apiOcisSpecific`. +Those scenarios are in this ocis repository in `tests/acceptance/features/apiOcisSpecific`. Have a look into the [documentation](https://doc.owncloud.com/server/developer_manual/testing/acceptance-tests.html#writing-scenarios-for-bugs) to understand why we are writing those tests. If you want to work on a specific issue @@ -84,7 +84,7 @@ If you want to work on a specific issue } } -2. locally run each of the tests marked with that issue in the expected failures file. This must be run inside the `./ocis` directory. +2. locally run each of the tests marked with that issue in the expected failures file. E.g.: ``` diff --git a/ocis/Makefile b/ocis/Makefile index 87cf5746a..4f43bd2d5 100644 --- a/ocis/Makefile +++ b/ocis/Makefile @@ -147,21 +147,3 @@ config-docs-generate: .PHONY: watch watch: go run github.com/cespare/reflex -c reflex.conf - -BEHAT_BIN=vendor-bin/behat/vendor/bin/behat - -.PHONY: test-acceptance-api -test-acceptance-api: vendor-bin/behat/vendor - BEHAT_BIN=$(BEHAT_BIN) $(PATH_TO_CORE)/tests/acceptance/run.sh --remote --type api - -vendor/bamarni/composer-bin-plugin: composer.lock - composer install - -vendor-bin/behat/vendor: vendor/bamarni/composer-bin-plugin vendor-bin/behat/composer.lock - composer bin behat install --no-progress - -vendor-bin/behat/composer.lock: vendor-bin/behat/composer.json - @echo behat composer.lock is not up to date. - -composer.lock: composer.json - @echo composer.lock is not up to date. diff --git a/ocis/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml similarity index 100% rename from ocis/tests/acceptance/config/behat.yml rename to tests/acceptance/config/behat.yml diff --git a/ocis/tests/acceptance/expected-failures-on-EOS-storage.txt b/tests/acceptance/expected-failures-on-EOS-storage.txt similarity index 100% rename from ocis/tests/acceptance/expected-failures-on-EOS-storage.txt rename to tests/acceptance/expected-failures-on-EOS-storage.txt diff --git a/ocis/tests/acceptance/expected-failures-on-OCIS-storage.txt b/tests/acceptance/expected-failures-on-OCIS-storage.txt similarity index 100% rename from ocis/tests/acceptance/expected-failures-on-OCIS-storage.txt rename to tests/acceptance/expected-failures-on-OCIS-storage.txt diff --git a/ocis/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt b/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt similarity index 100% rename from ocis/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt rename to tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt diff --git a/ocis/tests/acceptance/features/apiBasic/addUser.feature b/tests/acceptance/features/apiBasic/addUser.feature similarity index 100% rename from ocis/tests/acceptance/features/apiBasic/addUser.feature rename to tests/acceptance/features/apiBasic/addUser.feature diff --git a/ocis/tests/acceptance/features/apiBasic/createShareToSharesFolder.feature b/tests/acceptance/features/apiBasic/createShareToSharesFolder.feature similarity index 100% rename from ocis/tests/acceptance/features/apiBasic/createShareToSharesFolder.feature rename to tests/acceptance/features/apiBasic/createShareToSharesFolder.feature diff --git a/ocis/tests/acceptance/features/apiBasic/uploadFile.feature b/tests/acceptance/features/apiBasic/uploadFile.feature similarity index 100% rename from ocis/tests/acceptance/features/apiBasic/uploadFile.feature rename to tests/acceptance/features/apiBasic/uploadFile.feature diff --git a/ocis/tests/acceptance/features/apiBasic/webDavPUTAuthInvalid.feature b/tests/acceptance/features/apiBasic/webDavPUTAuthInvalid.feature similarity index 100% rename from ocis/tests/acceptance/features/apiBasic/webDavPUTAuthInvalid.feature rename to tests/acceptance/features/apiBasic/webDavPUTAuthInvalid.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature rename to tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature rename to tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature rename to tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature rename to tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavLOCKAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavLOCKAuth.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavLOCKAuth.feature rename to tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavLOCKAuth.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavMOVEAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavMOVEAuth.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavMOVEAuth.feature rename to tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavMOVEAuth.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavPROPFINDAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavPROPFINDAuth.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavPROPFINDAuth.feature rename to tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavPROPFINDAuth.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiCapabilities-capabilitiesWithNormalUser.feature b/tests/acceptance/features/apiOcisSpecific/apiCapabilities-capabilitiesWithNormalUser.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiCapabilities-capabilitiesWithNormalUser.feature rename to tests/acceptance/features/apiOcisSpecific/apiCapabilities-capabilitiesWithNormalUser.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiFavorites-favorites.feature b/tests/acceptance/features/apiOcisSpecific/apiFavorites-favorites.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiFavorites-favorites.feature rename to tests/acceptance/features/apiOcisSpecific/apiFavorites-favorites.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiMain-checksums.feature b/tests/acceptance/features/apiOcisSpecific/apiMain-checksums.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiMain-checksums.feature rename to tests/acceptance/features/apiOcisSpecific/apiMain-checksums.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiMain-main.feature b/tests/acceptance/features/apiOcisSpecific/apiMain-main.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiMain-main.feature rename to tests/acceptance/features/apiOcisSpecific/apiMain-main.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature b/tests/acceptance/features/apiOcisSpecific/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature rename to tests/acceptance/features/apiOcisSpecific/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature b/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature rename to tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareOperations-getWebDAVSharePermissions.feature b/tests/acceptance/features/apiOcisSpecific/apiShareOperations-getWebDAVSharePermissions.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiShareOperations-getWebDAVSharePermissions.feature rename to tests/acceptance/features/apiOcisSpecific/apiShareOperations-getWebDAVSharePermissions.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareOperations-gettingShares.feature b/tests/acceptance/features/apiOcisSpecific/apiShareOperations-gettingShares.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiShareOperations-gettingShares.feature rename to tests/acceptance/features/apiOcisSpecific/apiShareOperations-gettingShares.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-copyFromPublicLink.feature b/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-copyFromPublicLink.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-copyFromPublicLink.feature rename to tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-copyFromPublicLink.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-uploadToPublicLinkShare.feature b/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-uploadToPublicLinkShare.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-uploadToPublicLinkShare.feature rename to tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-uploadToPublicLinkShare.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature b/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature rename to tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareWebdavOperations-propfind.feature b/tests/acceptance/features/apiOcisSpecific/apiShareWebdavOperations-propfind.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiShareWebdavOperations-propfind.feature rename to tests/acceptance/features/apiOcisSpecific/apiShareWebdavOperations-propfind.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature b/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature rename to tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiVersions-fileVersions.feature b/tests/acceptance/features/apiOcisSpecific/apiVersions-fileVersions.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiVersions-fileVersions.feature rename to tests/acceptance/features/apiOcisSpecific/apiVersions-fileVersions.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolder.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolder.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolder.feature rename to tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolder.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolderToBlacklistedName.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolderToBlacklistedName.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolderToBlacklistedName.feature rename to tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolderToBlacklistedName.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFile.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFile.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFile.feature rename to tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFile.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFileToBlacklistedName.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFileToBlacklistedName.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFileToBlacklistedName.feature rename to tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFileToBlacklistedName.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-downloadFile.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-downloadFile.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-downloadFile.feature rename to tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-downloadFile.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-refuseAccess.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-refuseAccess.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-refuseAccess.feature rename to tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-refuseAccess.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature rename to tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-createFolder.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-createFolder.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-createFolder.feature rename to tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-createFolder.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-setFileProperties.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-setFileProperties.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-setFileProperties.feature rename to tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-setFileProperties.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties2-getFileProperties.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties2-getFileProperties.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties2-getFileProperties.feature rename to tests/acceptance/features/apiOcisSpecific/apiWebdavProperties2-getFileProperties.feature diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavUpload1-uploadFile.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavUpload1-uploadFile.feature similarity index 100% rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavUpload1-uploadFile.feature rename to tests/acceptance/features/apiOcisSpecific/apiWebdavUpload1-uploadFile.feature diff --git a/ocis/tests/acceptance/features/bootstrap/RevaContext.php b/tests/acceptance/features/bootstrap/RevaContext.php similarity index 100% rename from ocis/tests/acceptance/features/bootstrap/RevaContext.php rename to tests/acceptance/features/bootstrap/RevaContext.php diff --git a/ocis/tests/acceptance/features/bootstrap/bootstrap.php b/tests/acceptance/features/bootstrap/bootstrap.php similarity index 100% rename from ocis/tests/acceptance/features/bootstrap/bootstrap.php rename to tests/acceptance/features/bootstrap/bootstrap.php diff --git a/ocis/tests/config/drone/identifier-registration.yml b/tests/config/drone/identifier-registration.yml similarity index 100% rename from ocis/tests/config/drone/identifier-registration.yml rename to tests/config/drone/identifier-registration.yml diff --git a/ocis/tests/config/drone/ocis-config.json b/tests/config/drone/ocis-config.json similarity index 100% rename from ocis/tests/config/drone/ocis-config.json rename to tests/config/drone/ocis-config.json diff --git a/test/k6/.babelrc b/tests/k6/.babelrc similarity index 100% rename from test/k6/.babelrc rename to tests/k6/.babelrc diff --git a/test/k6/README.md b/tests/k6/README.md similarity index 100% rename from test/k6/README.md rename to tests/k6/README.md diff --git a/test/k6/package.json b/tests/k6/package.json similarity index 100% rename from test/k6/package.json rename to tests/k6/package.json diff --git a/test/k6/rollup.config.js b/tests/k6/rollup.config.js similarity index 100% rename from test/k6/rollup.config.js rename to tests/k6/rollup.config.js diff --git a/test/k6/scripts/postinstall.js b/tests/k6/scripts/postinstall.js similarity index 100% rename from test/k6/scripts/postinstall.js rename to tests/k6/scripts/postinstall.js diff --git a/test/k6/src/lib/api.ts b/tests/k6/src/lib/api.ts similarity index 100% rename from test/k6/src/lib/api.ts rename to tests/k6/src/lib/api.ts diff --git a/test/k6/src/lib/defaults.ts b/tests/k6/src/lib/defaults.ts similarity index 100% rename from test/k6/src/lib/defaults.ts rename to tests/k6/src/lib/defaults.ts diff --git a/test/k6/src/lib/index.ts b/tests/k6/src/lib/index.ts similarity index 100% rename from test/k6/src/lib/index.ts rename to tests/k6/src/lib/index.ts diff --git a/test/k6/src/lib/types.ts b/tests/k6/src/lib/types.ts similarity index 100% rename from test/k6/src/lib/types.ts rename to tests/k6/src/lib/types.ts diff --git a/test/k6/src/lib/utils.ts b/tests/k6/src/lib/utils.ts similarity index 100% rename from test/k6/src/lib/utils.ts rename to tests/k6/src/lib/utils.ts diff --git a/test/k6/src/test-issue-162.ts b/tests/k6/src/test-issue-162.ts similarity index 100% rename from test/k6/src/test-issue-162.ts rename to tests/k6/src/test-issue-162.ts diff --git a/test/k6/ tsconfig.json b/tests/k6/tsconfig.json similarity index 100% rename from test/k6/ tsconfig.json rename to tests/k6/tsconfig.json diff --git a/test/k6/yarn.lock b/tests/k6/yarn.lock similarity index 100% rename from test/k6/yarn.lock rename to tests/k6/yarn.lock diff --git a/ocis/vendor-bin/behat/composer.json b/vendor-bin/behat/composer.json similarity index 100% rename from ocis/vendor-bin/behat/composer.json rename to vendor-bin/behat/composer.json