Skip to content

Commit df3aba5

Browse files
committed
MAGETWO-32378: Fix static test failures as a result of adding api-functional tests
- Excluded api-functional tests from PSR-X code style check - Excluded Magento\Webapi\Routing\RequestIdOverrideTest from Magento\Test\Legacy\WordsTest
1 parent a398195 commit df3aba5

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@
6161
<path>dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php</path>
6262
<word>overriden</word>
6363
</item>
64+
<item>
65+
<path>dev/tests/api-functional/testsuite/Magento/Webapi/Routing/RequestIdOverrideTest.php</path>
66+
<word>overriden</word>
67+
</item>
6468
<item>
6569
<path>app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml</path>
6670
<word>head.js</word>

dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input
3232
lib/internal/Magento/Framework/Translate/Adapter.php
3333
# __ method for Translate cannot be in camelCase
3434
lib/internal/Magento/Framework/Translate/AdapterInterface.php
35-
# PSR-1 not applied to
35+
# Exclude unit, integration, and api-functional tests from PSR-X code style check
36+
dev/tests/api-functional/testsuite/Magento
3637
dev/tests/integration/testsuite/Magento
37-
# PSR-1 not applied to
3838
dev/tests/unit/testsuite/Magento
3939
# Newer version of phpcs does not complain about spacing issue. This appears to be a bug in the phpcs version that is currently run in bamboo.
4040
app/code/Magento/Sales/Model/Order/Payment/Transaction.php

0 commit comments

Comments
 (0)