From 6958bcc55af76c4a08257c6e9a35817caf1ad36f Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 15 Feb 2018 17:07:04 +0545 Subject: [PATCH] Rename integration API tests to acceptance --- Jenkinsfile | 8 ++++---- Makefile | 20 +++++++++---------- tests/{integration => acceptance}/.gitignore | 0 tests/{integration => acceptance}/Makefile | 0 .../capabilities.feature | 0 .../config/behat.yml | 0 .../data/davtest.txt | 0 .../data/file_to_overwrite.txt | 0 .../data/textfile.txt | 0 .../features/appmanagement.feature | 0 .../features/auth.feature | 0 .../features/bootstrap/AppConfiguration.php | 0 .../bootstrap/AppManagementContext.php | 0 .../features/bootstrap/Auth.php | 0 .../features/bootstrap/BasicStructure.php | 0 .../features/bootstrap/CalDavContext.php | 0 .../bootstrap/CapabilitiesContext.php | 0 .../features/bootstrap/CardDavContext.php | 0 .../features/bootstrap/Checksums.php | 0 .../features/bootstrap/CommandLine.php | 0 .../features/bootstrap/Comments.php | 0 .../features/bootstrap/FeatureContext.php | 0 .../features/bootstrap/Federation.php | 0 .../features/bootstrap/FederationContext.php | 0 .../features/bootstrap/MailTool.php | 0 .../features/bootstrap/Provisioning.php | 0 .../features/bootstrap/ShareesContext.php | 0 .../features/bootstrap/Sharing.php | 0 .../features/bootstrap/Tags.php | 0 .../features/bootstrap/Trashbin.php | 0 .../features/bootstrap/WebDav.php | 0 .../features/bootstrap/bootstrap.php | 0 .../features/caldav.feature | 0 .../features/carddav.feature | 0 .../features/checksums.feature | 0 .../features/comments.feature | 0 .../features/dav-versions.feature | 0 .../features/external-storage.feature | 0 .../features/favorites.feature | 0 .../features/multilinksharing.feature | 0 .../features/provisioning-v1.feature | 0 .../features/provisioning-v2.feature | 0 .../features/quota.feature | 0 .../features/recreatemasterkey.feature | 0 .../features/sharing-v1.feature | 0 .../features/status.feature | 0 .../features/tags.feature | 0 .../features/transfer-ownership.feature | 0 .../features/trashbin-new-endpoint.feature | 0 .../features/trashbin-old-endpoint.feature | 0 .../webdav-related-new-endpoint.feature | 0 .../webdav-related-old-endpoint.feature | 0 .../federation_features/federated.feature | 0 tests/{integration => acceptance}/run.sh | 0 .../sharees_features/sharees.feature | 0 .../sharees_provisioningapiv2.feature | 0 .../skeleton/FOLDER/.gitignore | 0 .../skeleton/PARENT/CHILD/child.txt | 0 .../skeleton/PARENT/parent.txt | 0 .../skeleton/textfile0.txt | 0 .../skeleton/textfile1.txt | 0 .../skeleton/textfile2.txt | 0 .../skeleton/textfile3.txt | 0 .../skeleton/textfile4.txt | 0 .../skeleton/welcome.txt | 0 tests/apps.php | 2 +- 66 files changed, 15 insertions(+), 15 deletions(-) rename tests/{integration => acceptance}/.gitignore (100%) rename tests/{integration => acceptance}/Makefile (100%) rename tests/{integration => acceptance}/capabilities_features/capabilities.feature (100%) rename tests/{integration => acceptance}/config/behat.yml (100%) rename tests/{integration => acceptance}/data/davtest.txt (100%) rename tests/{integration => acceptance}/data/file_to_overwrite.txt (100%) rename tests/{integration => acceptance}/data/textfile.txt (100%) rename tests/{integration => acceptance}/features/appmanagement.feature (100%) rename tests/{integration => acceptance}/features/auth.feature (100%) rename tests/{integration => acceptance}/features/bootstrap/AppConfiguration.php (100%) rename tests/{integration => acceptance}/features/bootstrap/AppManagementContext.php (100%) rename tests/{integration => acceptance}/features/bootstrap/Auth.php (100%) rename tests/{integration => acceptance}/features/bootstrap/BasicStructure.php (100%) rename tests/{integration => acceptance}/features/bootstrap/CalDavContext.php (100%) rename tests/{integration => acceptance}/features/bootstrap/CapabilitiesContext.php (100%) rename tests/{integration => acceptance}/features/bootstrap/CardDavContext.php (100%) rename tests/{integration => acceptance}/features/bootstrap/Checksums.php (100%) rename tests/{integration => acceptance}/features/bootstrap/CommandLine.php (100%) rename tests/{integration => acceptance}/features/bootstrap/Comments.php (100%) rename tests/{integration => acceptance}/features/bootstrap/FeatureContext.php (100%) rename tests/{integration => acceptance}/features/bootstrap/Federation.php (100%) rename tests/{integration => acceptance}/features/bootstrap/FederationContext.php (100%) rename tests/{integration => acceptance}/features/bootstrap/MailTool.php (100%) rename tests/{integration => acceptance}/features/bootstrap/Provisioning.php (100%) rename tests/{integration => acceptance}/features/bootstrap/ShareesContext.php (100%) rename tests/{integration => acceptance}/features/bootstrap/Sharing.php (100%) rename tests/{integration => acceptance}/features/bootstrap/Tags.php (100%) rename tests/{integration => acceptance}/features/bootstrap/Trashbin.php (100%) rename tests/{integration => acceptance}/features/bootstrap/WebDav.php (100%) rename tests/{integration => acceptance}/features/bootstrap/bootstrap.php (100%) rename tests/{integration => acceptance}/features/caldav.feature (100%) rename tests/{integration => acceptance}/features/carddav.feature (100%) rename tests/{integration => acceptance}/features/checksums.feature (100%) rename tests/{integration => acceptance}/features/comments.feature (100%) rename tests/{integration => acceptance}/features/dav-versions.feature (100%) rename tests/{integration => acceptance}/features/external-storage.feature (100%) rename tests/{integration => acceptance}/features/favorites.feature (100%) rename tests/{integration => acceptance}/features/multilinksharing.feature (100%) rename tests/{integration => acceptance}/features/provisioning-v1.feature (100%) rename tests/{integration => acceptance}/features/provisioning-v2.feature (100%) rename tests/{integration => acceptance}/features/quota.feature (100%) rename tests/{integration => acceptance}/features/recreatemasterkey.feature (100%) rename tests/{integration => acceptance}/features/sharing-v1.feature (100%) rename tests/{integration => acceptance}/features/status.feature (100%) rename tests/{integration => acceptance}/features/tags.feature (100%) rename tests/{integration => acceptance}/features/transfer-ownership.feature (100%) rename tests/{integration => acceptance}/features/trashbin-new-endpoint.feature (100%) rename tests/{integration => acceptance}/features/trashbin-old-endpoint.feature (100%) rename tests/{integration => acceptance}/features/webdav-related-new-endpoint.feature (100%) rename tests/{integration => acceptance}/features/webdav-related-old-endpoint.feature (100%) rename tests/{integration => acceptance}/federation_features/federated.feature (100%) rename tests/{integration => acceptance}/run.sh (100%) rename tests/{integration => acceptance}/sharees_features/sharees.feature (100%) rename tests/{integration => acceptance}/sharees_features/sharees_provisioningapiv2.feature (100%) rename tests/{integration => acceptance}/skeleton/FOLDER/.gitignore (100%) rename tests/{integration => acceptance}/skeleton/PARENT/CHILD/child.txt (100%) rename tests/{integration => acceptance}/skeleton/PARENT/parent.txt (100%) rename tests/{integration => acceptance}/skeleton/textfile0.txt (100%) rename tests/{integration => acceptance}/skeleton/textfile1.txt (100%) rename tests/{integration => acceptance}/skeleton/textfile2.txt (100%) rename tests/{integration => acceptance}/skeleton/textfile3.txt (100%) rename tests/{integration => acceptance}/skeleton/textfile4.txt (100%) rename tests/{integration => acceptance}/skeleton/welcome.txt (100%) diff --git a/Jenkinsfile b/Jenkinsfile index 952b8d7bd671..b0ecafa85457 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,13 +58,13 @@ timestampedNode('SLAVE') { ''' } - stage 'Integration Testing' - executeAndReport('tests/integration/output/*.xml') { + stage 'Acceptance Testing' + executeAndReport('tests/acceptance/output/*.xml') { sh '''phpenv local 7.0 rm -rf config/config.php data/* ./occ maintenance:install --admin-pass=admin - make clean-test-integration - make test-integration OC_TEST_ALT_HOME=1 + make clean-test-acceptance + make test-acceptance OC_TEST_ALT_HOME=1 ''' } diff --git a/Makefile b/Makefile index 296c518a49d1..c2479241e5e2 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ help: @echo -e "make test-php\t\t\trun all PHP tests" @echo -e "make test-js\t\t\trun Javascript tests" @echo -e "make test-js-debug\t\trun Javascript tests in debug mode (continuous)" - @echo -e "make test-integration\t\trun integration tests" + @echo -e "make test-acceptance\t\trun acceptance tests" @echo -e "make clean-test\t\t\tclean test results" @echo @echo It is also possible to run individual PHP test files with the following command: @@ -174,9 +174,9 @@ test-js: $(nodejs_deps) test-js-debug: $(nodejs_deps) NODE_PATH='$(NODE_PREFIX)/node_modules' $(KARMA) start tests/karma.config.js -.PHONY: test-integration -test-integration: $(composer_dev_deps) - $(MAKE) -C tests/integration \ +.PHONY: test-acceptance +test-acceptance: $(composer_dev_deps) + $(MAKE) -C tests/acceptance \ OC_TEST_ALT_HOME=$(OC_TEST_ALT_HOME) \ OC_TEST_ENCRYPTION_ENABLED=$(OC_TEST_ENCRYPTION_ENABLED) \ OC_TEST_ENCRYPTION_MASTER_KEY_ENABLED=$(OC_TEST_ENCRYPTION_MASTER_KEY_ENABLED) @@ -186,19 +186,19 @@ test-php-lint: $(composer_dev_deps) $(composer_deps)/bin/parallel-lint --exclude lib/composer --exclude build . .PHONY: test -test: test-php-lint test-php test-js test-integration +test: test-php-lint test-php test-js test-acceptance -.PHONY: clean-test-integration -clean-test-integration: - $(MAKE) -C tests/integration clean +.PHONY: clean-test-acceptance +clean-test-acceptance: + $(MAKE) -C tests/acceptance clean .PHONY: clean-test-results clean-test-results: rm -Rf tests/autotest-*results*.xml - $(MAKE) -C tests/integration clean + $(MAKE) -C tests/acceptance clean .PHONY: clean-test -clean-test: clean-test-integration clean-test-results +clean-test: clean-test-acceptance clean-test-results # # Documentation diff --git a/tests/integration/.gitignore b/tests/acceptance/.gitignore similarity index 100% rename from tests/integration/.gitignore rename to tests/acceptance/.gitignore diff --git a/tests/integration/Makefile b/tests/acceptance/Makefile similarity index 100% rename from tests/integration/Makefile rename to tests/acceptance/Makefile diff --git a/tests/integration/capabilities_features/capabilities.feature b/tests/acceptance/capabilities_features/capabilities.feature similarity index 100% rename from tests/integration/capabilities_features/capabilities.feature rename to tests/acceptance/capabilities_features/capabilities.feature diff --git a/tests/integration/config/behat.yml b/tests/acceptance/config/behat.yml similarity index 100% rename from tests/integration/config/behat.yml rename to tests/acceptance/config/behat.yml diff --git a/tests/integration/data/davtest.txt b/tests/acceptance/data/davtest.txt similarity index 100% rename from tests/integration/data/davtest.txt rename to tests/acceptance/data/davtest.txt diff --git a/tests/integration/data/file_to_overwrite.txt b/tests/acceptance/data/file_to_overwrite.txt similarity index 100% rename from tests/integration/data/file_to_overwrite.txt rename to tests/acceptance/data/file_to_overwrite.txt diff --git a/tests/integration/data/textfile.txt b/tests/acceptance/data/textfile.txt similarity index 100% rename from tests/integration/data/textfile.txt rename to tests/acceptance/data/textfile.txt diff --git a/tests/integration/features/appmanagement.feature b/tests/acceptance/features/appmanagement.feature similarity index 100% rename from tests/integration/features/appmanagement.feature rename to tests/acceptance/features/appmanagement.feature diff --git a/tests/integration/features/auth.feature b/tests/acceptance/features/auth.feature similarity index 100% rename from tests/integration/features/auth.feature rename to tests/acceptance/features/auth.feature diff --git a/tests/integration/features/bootstrap/AppConfiguration.php b/tests/acceptance/features/bootstrap/AppConfiguration.php similarity index 100% rename from tests/integration/features/bootstrap/AppConfiguration.php rename to tests/acceptance/features/bootstrap/AppConfiguration.php diff --git a/tests/integration/features/bootstrap/AppManagementContext.php b/tests/acceptance/features/bootstrap/AppManagementContext.php similarity index 100% rename from tests/integration/features/bootstrap/AppManagementContext.php rename to tests/acceptance/features/bootstrap/AppManagementContext.php diff --git a/tests/integration/features/bootstrap/Auth.php b/tests/acceptance/features/bootstrap/Auth.php similarity index 100% rename from tests/integration/features/bootstrap/Auth.php rename to tests/acceptance/features/bootstrap/Auth.php diff --git a/tests/integration/features/bootstrap/BasicStructure.php b/tests/acceptance/features/bootstrap/BasicStructure.php similarity index 100% rename from tests/integration/features/bootstrap/BasicStructure.php rename to tests/acceptance/features/bootstrap/BasicStructure.php diff --git a/tests/integration/features/bootstrap/CalDavContext.php b/tests/acceptance/features/bootstrap/CalDavContext.php similarity index 100% rename from tests/integration/features/bootstrap/CalDavContext.php rename to tests/acceptance/features/bootstrap/CalDavContext.php diff --git a/tests/integration/features/bootstrap/CapabilitiesContext.php b/tests/acceptance/features/bootstrap/CapabilitiesContext.php similarity index 100% rename from tests/integration/features/bootstrap/CapabilitiesContext.php rename to tests/acceptance/features/bootstrap/CapabilitiesContext.php diff --git a/tests/integration/features/bootstrap/CardDavContext.php b/tests/acceptance/features/bootstrap/CardDavContext.php similarity index 100% rename from tests/integration/features/bootstrap/CardDavContext.php rename to tests/acceptance/features/bootstrap/CardDavContext.php diff --git a/tests/integration/features/bootstrap/Checksums.php b/tests/acceptance/features/bootstrap/Checksums.php similarity index 100% rename from tests/integration/features/bootstrap/Checksums.php rename to tests/acceptance/features/bootstrap/Checksums.php diff --git a/tests/integration/features/bootstrap/CommandLine.php b/tests/acceptance/features/bootstrap/CommandLine.php similarity index 100% rename from tests/integration/features/bootstrap/CommandLine.php rename to tests/acceptance/features/bootstrap/CommandLine.php diff --git a/tests/integration/features/bootstrap/Comments.php b/tests/acceptance/features/bootstrap/Comments.php similarity index 100% rename from tests/integration/features/bootstrap/Comments.php rename to tests/acceptance/features/bootstrap/Comments.php diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/acceptance/features/bootstrap/FeatureContext.php similarity index 100% rename from tests/integration/features/bootstrap/FeatureContext.php rename to tests/acceptance/features/bootstrap/FeatureContext.php diff --git a/tests/integration/features/bootstrap/Federation.php b/tests/acceptance/features/bootstrap/Federation.php similarity index 100% rename from tests/integration/features/bootstrap/Federation.php rename to tests/acceptance/features/bootstrap/Federation.php diff --git a/tests/integration/features/bootstrap/FederationContext.php b/tests/acceptance/features/bootstrap/FederationContext.php similarity index 100% rename from tests/integration/features/bootstrap/FederationContext.php rename to tests/acceptance/features/bootstrap/FederationContext.php diff --git a/tests/integration/features/bootstrap/MailTool.php b/tests/acceptance/features/bootstrap/MailTool.php similarity index 100% rename from tests/integration/features/bootstrap/MailTool.php rename to tests/acceptance/features/bootstrap/MailTool.php diff --git a/tests/integration/features/bootstrap/Provisioning.php b/tests/acceptance/features/bootstrap/Provisioning.php similarity index 100% rename from tests/integration/features/bootstrap/Provisioning.php rename to tests/acceptance/features/bootstrap/Provisioning.php diff --git a/tests/integration/features/bootstrap/ShareesContext.php b/tests/acceptance/features/bootstrap/ShareesContext.php similarity index 100% rename from tests/integration/features/bootstrap/ShareesContext.php rename to tests/acceptance/features/bootstrap/ShareesContext.php diff --git a/tests/integration/features/bootstrap/Sharing.php b/tests/acceptance/features/bootstrap/Sharing.php similarity index 100% rename from tests/integration/features/bootstrap/Sharing.php rename to tests/acceptance/features/bootstrap/Sharing.php diff --git a/tests/integration/features/bootstrap/Tags.php b/tests/acceptance/features/bootstrap/Tags.php similarity index 100% rename from tests/integration/features/bootstrap/Tags.php rename to tests/acceptance/features/bootstrap/Tags.php diff --git a/tests/integration/features/bootstrap/Trashbin.php b/tests/acceptance/features/bootstrap/Trashbin.php similarity index 100% rename from tests/integration/features/bootstrap/Trashbin.php rename to tests/acceptance/features/bootstrap/Trashbin.php diff --git a/tests/integration/features/bootstrap/WebDav.php b/tests/acceptance/features/bootstrap/WebDav.php similarity index 100% rename from tests/integration/features/bootstrap/WebDav.php rename to tests/acceptance/features/bootstrap/WebDav.php diff --git a/tests/integration/features/bootstrap/bootstrap.php b/tests/acceptance/features/bootstrap/bootstrap.php similarity index 100% rename from tests/integration/features/bootstrap/bootstrap.php rename to tests/acceptance/features/bootstrap/bootstrap.php diff --git a/tests/integration/features/caldav.feature b/tests/acceptance/features/caldav.feature similarity index 100% rename from tests/integration/features/caldav.feature rename to tests/acceptance/features/caldav.feature diff --git a/tests/integration/features/carddav.feature b/tests/acceptance/features/carddav.feature similarity index 100% rename from tests/integration/features/carddav.feature rename to tests/acceptance/features/carddav.feature diff --git a/tests/integration/features/checksums.feature b/tests/acceptance/features/checksums.feature similarity index 100% rename from tests/integration/features/checksums.feature rename to tests/acceptance/features/checksums.feature diff --git a/tests/integration/features/comments.feature b/tests/acceptance/features/comments.feature similarity index 100% rename from tests/integration/features/comments.feature rename to tests/acceptance/features/comments.feature diff --git a/tests/integration/features/dav-versions.feature b/tests/acceptance/features/dav-versions.feature similarity index 100% rename from tests/integration/features/dav-versions.feature rename to tests/acceptance/features/dav-versions.feature diff --git a/tests/integration/features/external-storage.feature b/tests/acceptance/features/external-storage.feature similarity index 100% rename from tests/integration/features/external-storage.feature rename to tests/acceptance/features/external-storage.feature diff --git a/tests/integration/features/favorites.feature b/tests/acceptance/features/favorites.feature similarity index 100% rename from tests/integration/features/favorites.feature rename to tests/acceptance/features/favorites.feature diff --git a/tests/integration/features/multilinksharing.feature b/tests/acceptance/features/multilinksharing.feature similarity index 100% rename from tests/integration/features/multilinksharing.feature rename to tests/acceptance/features/multilinksharing.feature diff --git a/tests/integration/features/provisioning-v1.feature b/tests/acceptance/features/provisioning-v1.feature similarity index 100% rename from tests/integration/features/provisioning-v1.feature rename to tests/acceptance/features/provisioning-v1.feature diff --git a/tests/integration/features/provisioning-v2.feature b/tests/acceptance/features/provisioning-v2.feature similarity index 100% rename from tests/integration/features/provisioning-v2.feature rename to tests/acceptance/features/provisioning-v2.feature diff --git a/tests/integration/features/quota.feature b/tests/acceptance/features/quota.feature similarity index 100% rename from tests/integration/features/quota.feature rename to tests/acceptance/features/quota.feature diff --git a/tests/integration/features/recreatemasterkey.feature b/tests/acceptance/features/recreatemasterkey.feature similarity index 100% rename from tests/integration/features/recreatemasterkey.feature rename to tests/acceptance/features/recreatemasterkey.feature diff --git a/tests/integration/features/sharing-v1.feature b/tests/acceptance/features/sharing-v1.feature similarity index 100% rename from tests/integration/features/sharing-v1.feature rename to tests/acceptance/features/sharing-v1.feature diff --git a/tests/integration/features/status.feature b/tests/acceptance/features/status.feature similarity index 100% rename from tests/integration/features/status.feature rename to tests/acceptance/features/status.feature diff --git a/tests/integration/features/tags.feature b/tests/acceptance/features/tags.feature similarity index 100% rename from tests/integration/features/tags.feature rename to tests/acceptance/features/tags.feature diff --git a/tests/integration/features/transfer-ownership.feature b/tests/acceptance/features/transfer-ownership.feature similarity index 100% rename from tests/integration/features/transfer-ownership.feature rename to tests/acceptance/features/transfer-ownership.feature diff --git a/tests/integration/features/trashbin-new-endpoint.feature b/tests/acceptance/features/trashbin-new-endpoint.feature similarity index 100% rename from tests/integration/features/trashbin-new-endpoint.feature rename to tests/acceptance/features/trashbin-new-endpoint.feature diff --git a/tests/integration/features/trashbin-old-endpoint.feature b/tests/acceptance/features/trashbin-old-endpoint.feature similarity index 100% rename from tests/integration/features/trashbin-old-endpoint.feature rename to tests/acceptance/features/trashbin-old-endpoint.feature diff --git a/tests/integration/features/webdav-related-new-endpoint.feature b/tests/acceptance/features/webdav-related-new-endpoint.feature similarity index 100% rename from tests/integration/features/webdav-related-new-endpoint.feature rename to tests/acceptance/features/webdav-related-new-endpoint.feature diff --git a/tests/integration/features/webdav-related-old-endpoint.feature b/tests/acceptance/features/webdav-related-old-endpoint.feature similarity index 100% rename from tests/integration/features/webdav-related-old-endpoint.feature rename to tests/acceptance/features/webdav-related-old-endpoint.feature diff --git a/tests/integration/federation_features/federated.feature b/tests/acceptance/federation_features/federated.feature similarity index 100% rename from tests/integration/federation_features/federated.feature rename to tests/acceptance/federation_features/federated.feature diff --git a/tests/integration/run.sh b/tests/acceptance/run.sh similarity index 100% rename from tests/integration/run.sh rename to tests/acceptance/run.sh diff --git a/tests/integration/sharees_features/sharees.feature b/tests/acceptance/sharees_features/sharees.feature similarity index 100% rename from tests/integration/sharees_features/sharees.feature rename to tests/acceptance/sharees_features/sharees.feature diff --git a/tests/integration/sharees_features/sharees_provisioningapiv2.feature b/tests/acceptance/sharees_features/sharees_provisioningapiv2.feature similarity index 100% rename from tests/integration/sharees_features/sharees_provisioningapiv2.feature rename to tests/acceptance/sharees_features/sharees_provisioningapiv2.feature diff --git a/tests/integration/skeleton/FOLDER/.gitignore b/tests/acceptance/skeleton/FOLDER/.gitignore similarity index 100% rename from tests/integration/skeleton/FOLDER/.gitignore rename to tests/acceptance/skeleton/FOLDER/.gitignore diff --git a/tests/integration/skeleton/PARENT/CHILD/child.txt b/tests/acceptance/skeleton/PARENT/CHILD/child.txt similarity index 100% rename from tests/integration/skeleton/PARENT/CHILD/child.txt rename to tests/acceptance/skeleton/PARENT/CHILD/child.txt diff --git a/tests/integration/skeleton/PARENT/parent.txt b/tests/acceptance/skeleton/PARENT/parent.txt similarity index 100% rename from tests/integration/skeleton/PARENT/parent.txt rename to tests/acceptance/skeleton/PARENT/parent.txt diff --git a/tests/integration/skeleton/textfile0.txt b/tests/acceptance/skeleton/textfile0.txt similarity index 100% rename from tests/integration/skeleton/textfile0.txt rename to tests/acceptance/skeleton/textfile0.txt diff --git a/tests/integration/skeleton/textfile1.txt b/tests/acceptance/skeleton/textfile1.txt similarity index 100% rename from tests/integration/skeleton/textfile1.txt rename to tests/acceptance/skeleton/textfile1.txt diff --git a/tests/integration/skeleton/textfile2.txt b/tests/acceptance/skeleton/textfile2.txt similarity index 100% rename from tests/integration/skeleton/textfile2.txt rename to tests/acceptance/skeleton/textfile2.txt diff --git a/tests/integration/skeleton/textfile3.txt b/tests/acceptance/skeleton/textfile3.txt similarity index 100% rename from tests/integration/skeleton/textfile3.txt rename to tests/acceptance/skeleton/textfile3.txt diff --git a/tests/integration/skeleton/textfile4.txt b/tests/acceptance/skeleton/textfile4.txt similarity index 100% rename from tests/integration/skeleton/textfile4.txt rename to tests/acceptance/skeleton/textfile4.txt diff --git a/tests/integration/skeleton/welcome.txt b/tests/acceptance/skeleton/welcome.txt similarity index 100% rename from tests/integration/skeleton/welcome.txt rename to tests/acceptance/skeleton/welcome.txt diff --git a/tests/apps.php b/tests/apps.php index 2fdbe968ac15..d75ec7974ed9 100644 --- a/tests/apps.php +++ b/tests/apps.php @@ -7,7 +7,7 @@ */ function loadDirectory($path) { - if (stripos(basename($path), 'integration') !== false) { + if (stripos(basename($path), 'acceptance') !== false) { return; } if (strcasecmp(basename($path), 'ui') === 0) {