Skip to content

Commit 661948c

Browse files
committed
Merge branch '2.4-develop' of github.com:vidyli/magento2 into issue-24635
2 parents 3f697e0 + 155a851 commit 661948c

File tree

13 files changed

+52
-39
lines changed

13 files changed

+52
-39
lines changed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"web-token/jwt-framework": "^v2.2.7"
8383
},
8484
"require-dev": {
85-
"allure-framework/allure-phpunit": "~1.2.0",
85+
"allure-framework/allure-phpunit": "~1.3.1",
8686
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
8787
"friendsofphp/php-cs-fixer": "~2.18.1",
8888
"lusitanian/oauth": "~0.8.10",

composer.lock

+40-27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/api-functional/phpunit_graphql.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<!-- Test listeners -->
5959
<listeners>
6060
<listener class="Magento\TestFramework\Event\PhpUnit"/>
61-
<listener class="Yandex\Allure\Adapter\AllureAdapter">
61+
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
6262
<arguments>
6363
<string>var/allure-results</string> <!-- XML files output folder -->
6464
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->

dev/tests/api-functional/phpunit_rest.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<!-- Test listeners -->
6565
<listeners>
6666
<listener class="Magento\TestFramework\Event\PhpUnit"/>
67-
<listener class="Yandex\Allure\Adapter\AllureAdapter">
67+
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
6868
<arguments>
6969
<string>var/allure-results</string> <!-- XML files output folder -->
7070
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->

dev/tests/api-functional/phpunit_soap.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<!-- Test listeners -->
6464
<listeners>
6565
<listener class="Magento\TestFramework\Event\PhpUnit"/>
66-
<listener class="Yandex\Allure\Adapter\AllureAdapter">
66+
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
6767
<arguments>
6868
<string>var/allure-results</string> <!-- XML files output folder -->
6969
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->

dev/tests/integration/framework/tests/unit/phpunit.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<ini name="date.timezone" value="America/Los_Angeles"/>
2323
</php>
2424
<listeners>
25-
<listener class="Yandex\Allure\Adapter\AllureAdapter">
25+
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
2626
<arguments>
2727
<string>var/allure-results</string> <!-- XML files output directory -->
2828
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->

dev/tests/integration/phpunit.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
</php>
8888
<!-- Test listeners -->
8989
<listeners>
90-
<listener class="Yandex\Allure\Adapter\AllureAdapter">
90+
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
9191
<arguments>
9292
<string>var/allure-results</string> <!-- XML files output directory -->
9393
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->

dev/tests/setup-integration/framework/tests/unit/phpunit.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<ini name="date.timezone" value="America/Los_Angeles"/>
2323
</php>
2424
<listeners>
25-
<listener class="Yandex\Allure\Adapter\AllureAdapter">
25+
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
2626
<arguments>
2727
<string>var/allure-results</string> <!-- XML files output directory -->
2828
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->

dev/tests/setup-integration/phpunit.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<listeners>
4444
<listener class="Magento\TestFramework\Event\PhpUnit"/>
4545
<listener class="Magento\TestFramework\ErrorLog\Listener"/>
46-
<listener class="Yandex\Allure\Adapter\AllureAdapter">
46+
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
4747
<arguments>
4848
<string>var/allure-results</string> <!-- XML files output directory -->
4949
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->

dev/tests/static/framework/tests/unit/phpunit.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<ini name="date.timezone" value="America/Los_Angeles"/>
2222
</php>
2323
<listeners>
24-
<listener class="Yandex\Allure\Adapter\AllureAdapter">
24+
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
2525
<arguments>
2626
<string>var/allure-results</string> <!-- XML files output directory -->
2727
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->

dev/tests/static/phpunit-all.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<const name="TESTCODESTYLE_IS_FULL_SCAN" value="0"/>
2525
</php>
2626
<listeners>
27-
<listener class="Yandex\Allure\Adapter\AllureAdapter">
27+
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
2828
<arguments>
2929
<string>var/allure-results</string> <!-- XML files output directory -->
3030
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->

dev/tests/static/phpunit.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<!--<const name="TESTS_COMPOSER_PATH" value="/usr/local/bin/composer"/>-->
4040
</php>
4141
<listeners>
42-
<listener class="Yandex\Allure\Adapter\AllureAdapter">
42+
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
4343
<arguments>
4444
<string>var/allure-results</string> <!-- XML files output directory -->
4545
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->

dev/tests/unit/phpunit.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</whitelist>
4646
</filter>
4747
<listeners>
48-
<listener class="Yandex\Allure\Adapter\AllureAdapter">
48+
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
4949
<arguments>
5050
<string>var/allure-results</string> <!-- XML files output directory -->
5151
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->

0 commit comments

Comments
 (0)