Merge pull request #9924 from owncloud/reorganize-test-folders

[tests-only][full-ci] reorganize test folders within the acceptance directory

.codacy.yml

@@ -14,8 +14,8 @@ exclude_paths:
   - 'accounts/rollup.config.js'
   - 'deployments/**'
   - 'tests/acceptance/expected-failures-*.md'
-  - 'tests/acceptance/features/bootstrap/**'
-  - 'tests/TestHelpers/**'
+  - 'tests/acceptance/bootstrap/**'
+  - 'tests/acceptance/TestHelpers/**'
   - 'tests/acceptance/run.sh'
   - 'vendor/**/*'
   - 'tests/ociswrapper/vendor/**'

Makefile

@@ -336,7 +336,7 @@ ci-format: $(BUILDIFIER)
 .PHONY: test-php-style
 test-php-style: vendor-bin/owncloud-codestyle/vendor vendor-bin/php_codesniffer/vendor
 	$(PHP_CS_FIXER) fix -v --diff --allow-risky yes --dry-run
-	$(PHP_CODESNIFFER) --cache --runtime-set ignore_warnings_on_exit --standard=phpcs.xml tests/acceptance tests/TestHelpers
+	$(PHP_CODESNIFFER) --cache --runtime-set ignore_warnings_on_exit --standard=phpcs.xml tests/acceptance tests/acceptance/TestHelpers
 
 .PHONY: test-php-style-fix
 test-php-style-fix: vendor-bin/owncloud-codestyle/vendor

tests/TestHelpers/HttpLogger.php → tests/acceptance/TestHelpers/HttpLogger.php

@@ -33,7 +33,7 @@ class HttpLogger {
 	 * @return string
 	 */
 	public static function getLogDir(): string {
-		return __DIR__ . '/../acceptance/logs';
+		return __DIR__ . '/../logs';
 	}
 
 	/**

tests/acceptance/features/bootstrap/FeatureContext.php → tests/acceptance/bootstrap/FeatureContext.php

@@ -2453,7 +2453,7 @@ public function temporaryStorageSubfolderName(): string {
 	 * @return string
 	 */
 	public function acceptanceTestsDirLocation(): string {
-		return \dirname(__FILE__) . "/../../";
+		return \dirname(__FILE__) . "/../";
 	}
 
 	/**
@@ -2857,9 +2857,9 @@ public static function getScenarioLine($scope): string {
 	public static function isExpectedToFail(string $scenarioLine): bool {
 		$expectedFailFile = \getenv('EXPECTED_FAILURES_FILE');
 		if (!$expectedFailFile) {
-			$expectedFailFile = __DIR__ . '/../../expected-failures-localAPI-on-OCIS-storage.md';
+			$expectedFailFile = __DIR__ . '/../expected-failures-localAPI-on-OCIS-storage.md';
 			if (\strpos($scenarioLine, "coreApi") === 0) {
-				$expectedFailFile = __DIR__ . '/../../expected-failures-API-on-OCIS-storage.md';
+				$expectedFailFile = __DIR__ . '/../expected-failures-API-on-OCIS-storage.md';
 			}
 		}
 

tests/acceptance/features/bootstrap/OCSContext.php → tests/acceptance/bootstrap/OCSContext.php

@@ -613,7 +613,7 @@ public function getOCSResponseStatusMessage(ResponseInterface $response):string
 	public function getActualStatusMessage(string $statusMessage, ?string $language = null):string {
 		if ($language !== null) {
 			$multiLingualMessage = \json_decode(
-				\file_get_contents(__DIR__ . "/../../fixtures/multiLanguageErrors.json"),
+				\file_get_contents(__DIR__ . "/../fixtures/multiLanguageErrors.json"),
 				true
 			);
 

tests/acceptance/features/bootstrap/OcisConfigContext.php → tests/acceptance/bootstrap/OcisConfigContext.php

@@ -85,7 +85,7 @@ public function theConfigHasBeenSetTo(string $configVariable, string $configValu
 	 * @throws GuzzleException
 	 */
 	public function theConfigHasBeenSetPathTo(string $configVariable, string $path): void {
-		$path = \dirname(__FILE__) . "/../../../" . $path;
+		$path = \dirname(__FILE__) . "/../../" . $path;
 		$response =  OcisConfigHelper::reConfigureOcis(
 			[
 				$configVariable => $path

tests/acceptance/features/bootstrap/WebDav.php → tests/acceptance/bootstrap/WebDav.php

@@ -3939,7 +3939,7 @@ public function checkImageDimensions(string $width, string $height, ?ResponseInt
 	 * @throws Exception
 	 */
 	public function theDownloadedPreviewContentShouldMatchWithFixturesPreviewContentFor(string $filename):void {
-		$expectedPreview = \file_get_contents(__DIR__ . "/../../fixtures/" . $filename);
+		$expectedPreview = \file_get_contents(__DIR__ . "/../fixtures/" . $filename);
 		Assert::assertEquals($expectedPreview, $this->responseBodyContent);
 	}
 

tests/acceptance/features/bootstrap/bootstrap.php → tests/acceptance/bootstrap/bootstrap.php

@@ -25,7 +25,7 @@
 
 $classLoader = new ClassLoader();
 
-$classLoader->addPsr4("TestHelpers\\", __DIR__ . "/../../../TestHelpers", true);
+$classLoader->addPsr4("TestHelpers\\", __DIR__ . "/../TestHelpers", true);
 
 $classLoader->register();
 

tests/acceptance/config/behat-core.yml

@@ -1,6 +1,6 @@
 default:
   autoload:
-    "": "%paths.base%/../features/bootstrap"
+    "": "%paths.base%/../bootstrap"
   suites:
     coreApiMain:
       paths:

tests/acceptance/config/behat.yml

@@ -1,6 +1,6 @@
 default:
   autoload:
-    "": "%paths.base%/../features/bootstrap"
+    "": "%paths.base%/../bootstrap"
 
   suites:
     apiAccountsHashDifficulty: