Rename integration API tests to acceptance

owncloud · Feb 15, 2018 · 6958bcc · 6958bcc
1 parent 2e46cb6
commit 6958bcc
Show file tree

Hide file tree

Showing 66 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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 → tests/acceptance/.gitignore b/tests/integration/.gitignore → tests/acceptance/.gitignore
diff --git a/tests/integration/Makefile → tests/acceptance/Makefile b/tests/integration/Makefile → tests/acceptance/Makefile
diff --git a/...apabilities_features/capabilities.feature → ...apabilities_features/capabilities.feature b/...apabilities_features/capabilities.feature → ...apabilities_features/capabilities.feature
diff --git a/tests/integration/config/behat.yml → tests/acceptance/config/behat.yml b/tests/integration/config/behat.yml → tests/acceptance/config/behat.yml
diff --git a/tests/integration/data/davtest.txt → tests/acceptance/data/davtest.txt b/tests/integration/data/davtest.txt → tests/acceptance/data/davtest.txt
diff --git a/tests/integration/data/file_to_overwrite.txt → tests/acceptance/data/file_to_overwrite.txt b/tests/integration/data/file_to_overwrite.txt → tests/acceptance/data/file_to_overwrite.txt
diff --git a/tests/integration/data/textfile.txt → tests/acceptance/data/textfile.txt b/tests/integration/data/textfile.txt → tests/acceptance/data/textfile.txt
diff --git a/...ntegration/features/appmanagement.feature → ...acceptance/features/appmanagement.feature b/...ntegration/features/appmanagement.feature → ...acceptance/features/appmanagement.feature
diff --git a/tests/integration/features/auth.feature → tests/acceptance/features/auth.feature b/tests/integration/features/auth.feature → tests/acceptance/features/auth.feature
diff --git a/...n/features/bootstrap/AppConfiguration.php → ...e/features/bootstrap/AppConfiguration.php b/...n/features/bootstrap/AppConfiguration.php → ...e/features/bootstrap/AppConfiguration.php
diff --git a/...atures/bootstrap/AppManagementContext.php → ...atures/bootstrap/AppManagementContext.php b/...atures/bootstrap/AppManagementContext.php → ...atures/bootstrap/AppManagementContext.php
diff --git a/...s/integration/features/bootstrap/Auth.php → tests/acceptance/features/bootstrap/Auth.php b/...s/integration/features/bootstrap/Auth.php → tests/acceptance/features/bootstrap/Auth.php
diff --git a/...ion/features/bootstrap/BasicStructure.php → ...nce/features/bootstrap/BasicStructure.php b/...ion/features/bootstrap/BasicStructure.php → ...nce/features/bootstrap/BasicStructure.php
diff --git a/...tion/features/bootstrap/CalDavContext.php → ...ance/features/bootstrap/CalDavContext.php b/...tion/features/bootstrap/CalDavContext.php → ...ance/features/bootstrap/CalDavContext.php
diff --git a/...eatures/bootstrap/CapabilitiesContext.php → ...eatures/bootstrap/CapabilitiesContext.php b/...eatures/bootstrap/CapabilitiesContext.php → ...eatures/bootstrap/CapabilitiesContext.php
diff --git a/...ion/features/bootstrap/CardDavContext.php → ...nce/features/bootstrap/CardDavContext.php b/...ion/features/bootstrap/CardDavContext.php → ...nce/features/bootstrap/CardDavContext.php
diff --git a/...egration/features/bootstrap/Checksums.php → ...ceptance/features/bootstrap/Checksums.php b/...egration/features/bootstrap/Checksums.php → ...ceptance/features/bootstrap/Checksums.php
diff --git a/...ration/features/bootstrap/CommandLine.php → ...ptance/features/bootstrap/CommandLine.php b/...ration/features/bootstrap/CommandLine.php → ...ptance/features/bootstrap/CommandLine.php
diff --git a/...tegration/features/bootstrap/Comments.php → ...cceptance/features/bootstrap/Comments.php b/...tegration/features/bootstrap/Comments.php → ...cceptance/features/bootstrap/Comments.php
diff --git a/...ion/features/bootstrap/FeatureContext.php → ...nce/features/bootstrap/FeatureContext.php b/...ion/features/bootstrap/FeatureContext.php → ...nce/features/bootstrap/FeatureContext.php
diff --git a/...gration/features/bootstrap/Federation.php → ...eptance/features/bootstrap/Federation.php b/...gration/features/bootstrap/Federation.php → ...eptance/features/bootstrap/Federation.php
diff --git a/.../features/bootstrap/FederationContext.php → .../features/bootstrap/FederationContext.php b/.../features/bootstrap/FederationContext.php → .../features/bootstrap/FederationContext.php
diff --git a/...tegration/features/bootstrap/MailTool.php → ...cceptance/features/bootstrap/MailTool.php b/...tegration/features/bootstrap/MailTool.php → ...cceptance/features/bootstrap/MailTool.php
diff --git a/...ation/features/bootstrap/Provisioning.php → ...tance/features/bootstrap/Provisioning.php b/...ation/features/bootstrap/Provisioning.php → ...tance/features/bootstrap/Provisioning.php
diff --git a/...ion/features/bootstrap/ShareesContext.php → ...nce/features/bootstrap/ShareesContext.php b/...ion/features/bootstrap/ShareesContext.php → ...nce/features/bootstrap/ShareesContext.php
diff --git a/...ntegration/features/bootstrap/Sharing.php → ...acceptance/features/bootstrap/Sharing.php b/...ntegration/features/bootstrap/Sharing.php → ...acceptance/features/bootstrap/Sharing.php
diff --git a/...s/integration/features/bootstrap/Tags.php → tests/acceptance/features/bootstrap/Tags.php b/...s/integration/features/bootstrap/Tags.php → tests/acceptance/features/bootstrap/Tags.php
diff --git a/...tegration/features/bootstrap/Trashbin.php → ...cceptance/features/bootstrap/Trashbin.php b/...tegration/features/bootstrap/Trashbin.php → ...cceptance/features/bootstrap/Trashbin.php
diff --git a/...integration/features/bootstrap/WebDav.php → .../acceptance/features/bootstrap/WebDav.php b/...integration/features/bootstrap/WebDav.php → .../acceptance/features/bootstrap/WebDav.php
diff --git a/...egration/features/bootstrap/bootstrap.php → ...ceptance/features/bootstrap/bootstrap.php b/...egration/features/bootstrap/bootstrap.php → ...ceptance/features/bootstrap/bootstrap.php
diff --git a/tests/integration/features/caldav.feature → tests/acceptance/features/caldav.feature b/tests/integration/features/caldav.feature → tests/acceptance/features/caldav.feature
diff --git a/tests/integration/features/carddav.feature → tests/acceptance/features/carddav.feature b/tests/integration/features/carddav.feature → tests/acceptance/features/carddav.feature
diff --git a/tests/integration/features/checksums.feature → tests/acceptance/features/checksums.feature b/tests/integration/features/checksums.feature → tests/acceptance/features/checksums.feature
diff --git a/tests/integration/features/comments.feature → tests/acceptance/features/comments.feature b/tests/integration/features/comments.feature → tests/acceptance/features/comments.feature
diff --git a/...integration/features/dav-versions.feature → .../acceptance/features/dav-versions.feature b/...integration/features/dav-versions.feature → .../acceptance/features/dav-versions.feature
diff --git a/...gration/features/external-storage.feature → ...eptance/features/external-storage.feature b/...gration/features/external-storage.feature → ...eptance/features/external-storage.feature
diff --git a/tests/integration/features/favorites.feature → tests/acceptance/features/favorites.feature b/tests/integration/features/favorites.feature → tests/acceptance/features/favorites.feature
diff --git a/...gration/features/multilinksharing.feature → ...eptance/features/multilinksharing.feature b/...gration/features/multilinksharing.feature → ...eptance/features/multilinksharing.feature
diff --git a/...egration/features/provisioning-v1.feature → ...ceptance/features/provisioning-v1.feature b/...egration/features/provisioning-v1.feature → ...ceptance/features/provisioning-v1.feature
diff --git a/...egration/features/provisioning-v2.feature → ...ceptance/features/provisioning-v2.feature b/...egration/features/provisioning-v2.feature → ...ceptance/features/provisioning-v2.feature
diff --git a/tests/integration/features/quota.feature → tests/acceptance/features/quota.feature b/tests/integration/features/quota.feature → tests/acceptance/features/quota.feature
diff --git a/...ration/features/recreatemasterkey.feature → ...ptance/features/recreatemasterkey.feature b/...ration/features/recreatemasterkey.feature → ...ptance/features/recreatemasterkey.feature
diff --git a/...s/integration/features/sharing-v1.feature → tests/acceptance/features/sharing-v1.feature b/...s/integration/features/sharing-v1.feature → tests/acceptance/features/sharing-v1.feature
diff --git a/tests/integration/features/status.feature → tests/acceptance/features/status.feature b/tests/integration/features/status.feature → tests/acceptance/features/status.feature
diff --git a/tests/integration/features/tags.feature → tests/acceptance/features/tags.feature b/tests/integration/features/tags.feature → tests/acceptance/features/tags.feature
diff --git a/...ation/features/transfer-ownership.feature → ...tance/features/transfer-ownership.feature b/...ation/features/transfer-ownership.feature → ...tance/features/transfer-ownership.feature
diff --git a/...on/features/trashbin-new-endpoint.feature → ...ce/features/trashbin-new-endpoint.feature b/...on/features/trashbin-new-endpoint.feature → ...ce/features/trashbin-new-endpoint.feature
diff --git a/...on/features/trashbin-old-endpoint.feature → ...ce/features/trashbin-old-endpoint.feature b/...on/features/trashbin-old-endpoint.feature → ...ce/features/trashbin-old-endpoint.feature
diff --git a/...tures/webdav-related-new-endpoint.feature → ...tures/webdav-related-new-endpoint.feature b/...tures/webdav-related-new-endpoint.feature → ...tures/webdav-related-new-endpoint.feature
diff --git a/...tures/webdav-related-old-endpoint.feature → ...tures/webdav-related-old-endpoint.feature b/...tures/webdav-related-old-endpoint.feature → ...tures/webdav-related-old-endpoint.feature
diff --git a/...ion/federation_features/federated.feature → ...nce/federation_features/federated.feature b/...ion/federation_features/federated.feature → ...nce/federation_features/federated.feature
diff --git a/tests/integration/run.sh → tests/acceptance/run.sh b/tests/integration/run.sh → tests/acceptance/run.sh
diff --git a/...egration/sharees_features/sharees.feature → ...ceptance/sharees_features/sharees.feature b/...egration/sharees_features/sharees.feature → ...ceptance/sharees_features/sharees.feature
diff --git a/...eatures/sharees_provisioningapiv2.feature → ...eatures/sharees_provisioningapiv2.feature b/...eatures/sharees_provisioningapiv2.feature → ...eatures/sharees_provisioningapiv2.feature
diff --git a/tests/integration/skeleton/FOLDER/.gitignore → tests/acceptance/skeleton/FOLDER/.gitignore b/tests/integration/skeleton/FOLDER/.gitignore → tests/acceptance/skeleton/FOLDER/.gitignore
diff --git a/...tegration/skeleton/PARENT/CHILD/child.txt → ...cceptance/skeleton/PARENT/CHILD/child.txt b/...tegration/skeleton/PARENT/CHILD/child.txt → ...cceptance/skeleton/PARENT/CHILD/child.txt
diff --git a/tests/integration/skeleton/PARENT/parent.txt → tests/acceptance/skeleton/PARENT/parent.txt b/tests/integration/skeleton/PARENT/parent.txt → tests/acceptance/skeleton/PARENT/parent.txt
diff --git a/tests/integration/skeleton/textfile0.txt → tests/acceptance/skeleton/textfile0.txt b/tests/integration/skeleton/textfile0.txt → tests/acceptance/skeleton/textfile0.txt
diff --git a/tests/integration/skeleton/textfile1.txt → tests/acceptance/skeleton/textfile1.txt b/tests/integration/skeleton/textfile1.txt → tests/acceptance/skeleton/textfile1.txt
diff --git a/tests/integration/skeleton/textfile2.txt → tests/acceptance/skeleton/textfile2.txt b/tests/integration/skeleton/textfile2.txt → tests/acceptance/skeleton/textfile2.txt
diff --git a/tests/integration/skeleton/textfile3.txt → tests/acceptance/skeleton/textfile3.txt b/tests/integration/skeleton/textfile3.txt → tests/acceptance/skeleton/textfile3.txt
diff --git a/tests/integration/skeleton/textfile4.txt → tests/acceptance/skeleton/textfile4.txt b/tests/integration/skeleton/textfile4.txt → tests/acceptance/skeleton/textfile4.txt
diff --git a/tests/integration/skeleton/welcome.txt → tests/acceptance/skeleton/welcome.txt b/tests/integration/skeleton/welcome.txt → tests/acceptance/skeleton/welcome.txt
diff --git 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) {