Skip to content

Commit da7fa9a

Browse files
committed
AC-2660::Fixed the config path
1 parent 3a8e62e commit da7fa9a

File tree

6 files changed

+20
-26
lines changed

6 files changed

+20
-26
lines changed

dev/tests/api-functional/allure/allure.config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
require "../../config/AllureConfig.php";
99

1010
$outputDirectory = __DIR__ . '/../var/allure-results';
11-
return AllureConfig::getAllureConfig($outputDirectory);
11+
return getAllureConfig($outputDirectory);

dev/tests/config/AllureConfig.php

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,24 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
declare(strict_types=1);
76

8-
namespace config;
9-
10-
class AllureConfig
7+
function getAllureConfig($outputDirectory): array
118
{
12-
public static function getAllureConfig($outputDirectory)
13-
{
14-
if (!file_exists($outputDirectory)) {
15-
mkdir($outputDirectory, 0755, true);
16-
}
9+
if (!file_exists($outputDirectory)) {
10+
mkdir($outputDirectory, 0755, true);
11+
}
1712

18-
return [
19-
// Path to output directory (default is build/allure-results)
20-
'outputDirectory' => $outputDirectory,
21-
'setupHook' => function () use ($outputDirectory): void {
22-
$files = scandir($outputDirectory);
23-
foreach ($files as $file) {
24-
$filePath = $outputDirectory . DIRECTORY_SEPARATOR . $file;
25-
if (is_file($filePath)) {
26-
unlink($filePath);
27-
}
13+
return [
14+
// Path to output directory (default is build/allure-results)
15+
'outputDirectory' => $outputDirectory,
16+
'setupHook' => function () use ($outputDirectory): void {
17+
$files = scandir($outputDirectory);
18+
foreach ($files as $file) {
19+
$filePath = $outputDirectory . DIRECTORY_SEPARATOR . $file;
20+
if (is_file($filePath)) {
21+
unlink($filePath);
2822
}
2923
}
30-
];
31-
}
24+
}
25+
];
3226
}

dev/tests/integration/allure/allure.config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
require_once __DIR__ . "/../../config/AllureConfig.php";
99

1010
$outputDirectory = __DIR__ . '/../var/allure-results';
11-
return AllureConfig::getAllureConfig($outputDirectory);
11+
return getAllureConfig($outputDirectory);

dev/tests/setup-integration/allure/allure.config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
require_once __DIR__ . "/../../config/AllureConfig.php";
99

1010
$outputDirectory = __DIR__ . '/../var/allure-results';
11-
return AllureConfig::getAllureConfig($outputDirectory);
11+
return getAllureConfig($outputDirectory);

dev/tests/static/allure/allure.config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
require_once __DIR__ . "/../../config/AllureConfig.php";
99

1010
$outputDirectory = __DIR__ . '/../var/allure-results';
11-
return AllureConfig::getAllureConfig($outputDirectory);
11+
return getAllureConfig($outputDirectory);

dev/tests/unit/allure/allure.config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
require_once __DIR__ . "/../../config/AllureConfig.php";
99

1010
$outputDirectory = __DIR__ . '/../var/allure-results';
11-
return AllureConfig::getAllureConfig($outputDirectory);
11+
return getAllureConfig($outputDirectory);

0 commit comments

Comments
 (0)