Skip to content

Commit ab3d43c

Browse files
author
Dmytro Aponasenko
committed
MTA-1316 Apply fixture changes to Magento
- fix tests
1 parent f80266b commit ab3d43c

File tree

158 files changed

+737
-629
lines changed

Some content is hidden

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

158 files changed

+737
-629
lines changed

‎dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<fixture xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Fixture/etc/fixture.xsd"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Fixture/etc/fixture.xsd"
1010
class="Magento\Backend\Test\Fixture\GlobalSearch">
1111
<module>Magento_Backend</module>
1212
<dataset name="default">

‎dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.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-
<repository xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Repository/etc/repository.xsd">
8+
<repository xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
99
<storage class="Magento\Core\Test\Repository\ConfigData">
1010
<dataset name="store_information">
1111
<field path="general/store_information/name" scope="general" scope_id="1" label="" xsi:type="string">Store 1</field>

‎dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<fixture xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Fixture/etc/fixture.xsd"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Fixture/etc/fixture.xsd"
1010
class="Magento\Bundle\Test\Fixture\BundleProduct">
1111
<module>Magento_Bundle</module>
1212
<type>eav</type>

‎dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/CheckoutData.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@ protected function getPreset($name)
166166
],
167167
[
168168
'title' => 'attribute_key_10',
169-
'value' => '12/12/2014',
169+
'value' => '12/12/2015',
170170
],
171171
[
172172
'title' => 'attribute_key_11',
173-
'value' => '12/12/2014/12/30/AM',
173+
'value' => '12/12/2015/12/30/AM',
174174
],
175175
[
176176
'title' => 'attribute_key_12',
@@ -257,11 +257,11 @@ protected function getPreset($name)
257257
],
258258
[
259259
'title' => 'attribute_key_7',
260-
'value' => '12/12/2014',
260+
'value' => '12/12/2015',
261261
],
262262
[
263263
'title' => 'attribute_key_8',
264-
'value' => '12/12/2014/12/30/AM',
264+
'value' => '12/12/2015/12/30/AM',
265265
],
266266
[
267267
'title' => 'attribute_key_9',

‎dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.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-
<repository xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Repository/etc/repository.xsd">
8+
<repository xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
99
<storage class="Magento\Bundle\Test\Repository\BundleProduct">
1010
<dataset name="BundleDynamic_sku_1073507449">
1111
<field name="sku" xsi:type="string">BundleDynamic_sku_10735074493</field>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,10 @@ protected function verifyPrice()
131131
*/
132132
protected function verifySpecialPrice()
133133
{
134-
$fixtureProductSpecialPrice = $this->product->getSpecialPrice();
135-
if (!$fixtureProductSpecialPrice) {
134+
if (!$this->product->hasData('special_price')) {
136135
return null;
137136
}
138-
137+
$fixtureProductSpecialPrice = $this->product->getSpecialPrice();
139138
$fixtureProductSpecialPrice = number_format($fixtureProductSpecialPrice, 2);
140139
$formProductSpecialPrice = $this->productView->getPriceBlock()->getSpecialPrice();
141140
if ($fixtureProductSpecialPrice == $formProductSpecialPrice) {

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<fixture xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Fixture/etc/fixture.xsd"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Fixture/etc/fixture.xsd"
1010
class="Magento\Catalog\Test\Fixture\CatalogAttributeSet">
1111
<module>Magento_Catalog</module>
1212
<type>flat</type>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<fixture xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Fixture/etc/fixture.xsd"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Fixture/etc/fixture.xsd"
1010
class="Magento\Catalog\Test\Fixture\CatalogProductAttribute">
1111
<module>Magento_Catalog</module>
1212
<type>composite</type>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<fixture xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Fixture/etc/fixture.xsd"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Fixture/etc/fixture.xsd"
1010
class="Magento\Catalog\Test\Fixture\CatalogProductSimple">
1111
<module>Magento_Catalog</module>
1212
<type>eav</type>
@@ -43,7 +43,7 @@
4343
<item name="input_prefix" xsi:type="string">product</item>
4444
</data_config>
4545
<fields>
46-
<field name="field">
46+
<field name="category_ids">
4747
<attribute_code>category_ids</attribute_code>
4848
<backend_type>static</backend_type>
4949
<is_required>0</is_required>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<fixture xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Mtf/Fixture/etc/fixture.xsd"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Fixture/etc/fixture.xsd"
1010
class="Magento\Catalog\Test\Fixture\CatalogProductVirtual">
1111
<module>Magento_Catalog</module>
1212
<type>eav</type>

0 commit comments

Comments
 (0)