Skip to content

Commit b43d513

Browse files
author
Dmytro Voskoboinikov
committed
MAGETWO-33569: Eliminate etc/global folder and move all files to etc/
1 parent 8a50df7 commit b43d513

File tree

127 files changed

+124
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+124
-124
lines changed

dev/tests/functional/etc/global/config.xml renamed to dev/tests/functional/etc/config.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<application>
1010
<reopenBrowser>testCase</reopenBrowser>
1111
<backendLogin>admin</backendLogin>
12-
<backendPassword>123123q</backendPassword>
13-
<appBackendUrl>http://magento.dev/backend/</appBackendUrl>
12+
<backendPassword>222222w</backendPassword>
13+
<appBackendUrl>http://magento.dev/admin/</appBackendUrl>
1414
<backendLoginUrl>admin</backendLoginUrl>
1515
</application>
1616
<install>

dev/tests/functional/etc/global/di.xml renamed to dev/tests/functional/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<preference for="Magento\Mtf\Util\Generate\Repository\CollectionProviderInterface" type="Magento\Mtf\Util\Generate\Repository\CollectionProvider" />
1111
<virtualType name="Magento\Mtf\Config\SchemaLocator\Config" type="Magento\Mtf\Config\SchemaLocator">
1212
<arguments>
13-
<argument name="schemaPath" xsi:type="string">etc/global/config.xsd</argument>
13+
<argument name="schemaPath" xsi:type="string">etc/config.xsd</argument>
1414
</arguments>
1515
</virtualType>
1616
</config>

dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../etc/global/variations.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../etc/variations.xsd">
99
<testCase name="CreateBundleProductEntityTest">
1010
<variation name="CreateBundleProductEntityTestVariation1">
1111
<data name="product/data/name">BundleProduct %isolation%</data>

dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../etc/global/variations.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../etc/variations.xsd">
99
<testCase name="UpdateBundleProductEntityTest">
1010
<variation name="UpdateBundleProductEntityTestVariation1">
1111
<data name="originalProduct/dataSet">bundle_dynamic_product</data>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../etc/global/variations.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../etc/variations.xsd">
99
<testCase name="CreateCategoryEntityTest">
1010
<variation name="CreateCategoryEntityTestVariation1">
1111
<data name="description">Create root category with required fields</data>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../etc/global/variations.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../etc/variations.xsd">
99
<testCase name="DeleteCategoryEntityTest">
1010
<variation name="DeleteCategoryEntityTestVariation1">
1111
<data name="category/dataSet">root_category</data>

0 commit comments

Comments
 (0)