From df3aba5a8ca9b2ab37a96f89c864df1b32d19fbf Mon Sep 17 00:00:00 2001 From: Yuxing Zheng Date: Wed, 7 Jan 2015 14:20:25 -0600 Subject: [PATCH 1/2] 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 --- .../static/testsuite/Magento/Test/Legacy/_files/words_ce.xml | 4 ++++ .../Magento/Test/Php/_files/phpcs/blacklist/common.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml index cfefeaf22d964..c3b1e7c0134b6 100644 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml @@ -61,6 +61,10 @@ dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php overriden + + dev/tests/api-functional/testsuite/Magento/Webapi/Routing/RequestIdOverrideTest.php + overriden + app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml head.js diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt index b08055eedb4f7..841a60c33f803 100644 --- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt +++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt @@ -32,9 +32,9 @@ dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd/input lib/internal/Magento/Framework/Translate/Adapter.php # __ method for Translate cannot be in camelCase lib/internal/Magento/Framework/Translate/AdapterInterface.php -# PSR-1 not applied to +# Exclude unit, integration, and api-functional tests from PSR-X code style check +dev/tests/api-functional/testsuite/Magento dev/tests/integration/testsuite/Magento -# PSR-1 not applied to dev/tests/unit/testsuite/Magento # 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. app/code/Magento/Sales/Model/Order/Payment/Transaction.php From 88caa27f0f8552bf91473becceb30d441a782847 Mon Sep 17 00:00:00 2001 From: Yuxing Zheng Date: Wed, 7 Jan 2015 15:03:00 -0600 Subject: [PATCH 2/2] MAGETWO-32378: Fix static test failures as a result of adding api-functional tests - Excluded the whole api-functional directory from PSR-X code style check - Made similar changes for integration and unit test directory for consistency --- .../Magento/Test/Php/_files/phpcs/blacklist/common.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt index 841a60c33f803..0e230d6265703 100644 --- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt +++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt @@ -33,9 +33,9 @@ lib/internal/Magento/Framework/Translate/Adapter.php # __ method for Translate cannot be in camelCase lib/internal/Magento/Framework/Translate/AdapterInterface.php # Exclude unit, integration, and api-functional tests from PSR-X code style check -dev/tests/api-functional/testsuite/Magento -dev/tests/integration/testsuite/Magento -dev/tests/unit/testsuite/Magento +dev/tests/api-functional +dev/tests/integration +dev/tests/unit # 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. app/code/Magento/Sales/Model/Order/Payment/Transaction.php vendor