[stable10] Rename integration API tests to acceptance

Jenkinsfile

@@ -87,40 +87,40 @@ timestampedNode('SLAVE') {
             '''
         }
 
-	stage 'Integration Testing'
-        currentStage = 'Integration Testing'
-		executeAndReport('tests/integration/output/*.xml', currentStage) {
+	stage 'Acceptance Testing'
+        currentStage = 'Acceptance Testing'
+		executeAndReport('tests/acceptance/output/*.xml', currentStage) {
 			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
 		   '''
 		}
 
-	stage 'Integration Testing Encrypted'
-        currentStage = 'Integration Testing Encrypted'
+	stage 'Acceptance Testing Encrypted'
+        currentStage = 'Acceptance Testing Encrypted'
 		if (isOnReleaseBranch()) {
-				executeAndReport('tests/integration/output/*.xml', currentStage) {
+				executeAndReport('tests/acceptance/output/*.xml', currentStage) {
 					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 OC_TEST_ENCRYPTION_ENABLED=1
+					make clean-test-acceptance
+					make test-acceptance OC_TEST_ALT_HOME=1 OC_TEST_ENCRYPTION_ENABLED=1
 				   '''
 				}
 			}
 
 
-	stage 'Integration Testing Encrypted with master key'
-        currentStage = 'Integration Testing Encrypted with master key'
+	stage 'Acceptance Testing Encrypted with master key'
+        currentStage = 'Acceptance Testing Encrypted with master key'
 		if (isOnReleaseBranch()) {
-				executeAndReport('tests/integration/output/*.xml', currentStage) {
+				executeAndReport('tests/acceptance/output/*.xml', currentStage) {
 					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 OC_TEST_ENCRYPTION_MASTER_KEY_ENABLED=1
+					make clean-test-acceptance
+					make test-acceptance OC_TEST_ALT_HOME=1 OC_TEST_ENCRYPTION_MASTER_KEY_ENABLED=1
 				   '''
 				}
 			}
@@ -140,7 +140,7 @@ void executeAndReport(String testResultLocation, String stage, def body) {
     // We're wrapping this in a timeout - if it takes longer, kill it.
     try {
         def timeoutMinutes = 120
-        if (stage.startsWith('Integration Testing')) {
+        if (stage.startsWith('Acceptance Testing')) {
             timeoutMinutes = 240
         }
         timeout(time: timeoutMinutes, unit: 'MINUTES') {

Makefile

@@ -97,7 +97,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:
@@ -190,9 +190,9 @@ test-js: $(nodejs_deps) $(js_deps) $(core_vendor)
 test-js-debug: $(nodejs_deps) $(js_deps) $(core_vendor)
 	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)
@@ -202,19 +202,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

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) {