Skip to content

Commit 110c0a4

Browse files
cparticacpartica
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-63116_JSON_ERROR
2 parents d7405ff + f86fa3f commit 110c0a4

File tree

18 files changed

+98
-115
lines changed

18 files changed

+98
-115
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,11 @@
201201
</item>
202202
<item name="9" xsi:type="array">
203203
<item name="title" xsi:type="string">attribute_key_10</item>
204-
<item name="value" xsi:type="string">12/12/2016</item>
204+
<item name="value" xsi:type="string">12/12/2017</item>
205205
</item>
206206
<item name="10" xsi:type="array">
207207
<item name="title" xsi:type="string">attribute_key_11</item>
208-
<item name="value" xsi:type="string">12/12/2016/12/30/AM</item>
208+
<item name="value" xsi:type="string">12/12/2017/12/30/AM</item>
209209
</item>
210210
<item name="11" xsi:type="array">
211211
<item name="title" xsi:type="string">attribute_key_12</item>
@@ -330,11 +330,11 @@
330330
</item>
331331
<item name="7" xsi:type="array">
332332
<item name="title" xsi:type="string">attribute_key_7</item>
333-
<item name="value" xsi:type="string">12/12/2016</item>
333+
<item name="value" xsi:type="string">12/12/2017</item>
334334
</item>
335335
<item name="8" xsi:type="array">
336336
<item name="title" xsi:type="string">attribute_key_8</item>
337-
<item name="value" xsi:type="string">12/12/2016/12/30/AM</item>
337+
<item name="value" xsi:type="string">12/12/2017/12/30/AM</item>
338338
</item>
339339
<item name="9" xsi:type="array">
340340
<item name="title" xsi:type="string">attribute_key_9</item>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
<data name="product/data/price/dataset" xsi:type="string">dynamic-50</data>
173173
<data name="product/data/weight_type" xsi:type="string">No</data>
174174
<data name="product/data/weight" xsi:type="string">10</data>
175-
<data name="product/data/tier_price/dataset" xsi:type="string">default</data>
175+
<data name="product/data/tier_price/dataset" xsi:type="string">custom_with_percentage_discount</data>
176176
<data name="product/data/price_view" xsi:type="string">As Low as</data>
177177
<data name="product/data/stock_data/use_config_manage_stock" xsi:type="string">No</data>
178178
<data name="product/data/stock_data/manage_stock" xsi:type="string">No</data>
@@ -349,7 +349,7 @@
349349
<data name="product/data/price/dataset" xsi:type="string">fixed-100</data>
350350
<data name="product/data/weight_type" xsi:type="string">No</data>
351351
<data name="product/data/weight" xsi:type="string">10</data>
352-
<data name="product/data/tier_price/dataset" xsi:type="string">default</data>
352+
<data name="product/data/tier_price/dataset" xsi:type="string">custom_with_percentage_discount</data>
353353
<data name="product/data/price_view" xsi:type="string">As Low as</data>
354354
<data name="product/data/stock_data/use_config_manage_stock" xsi:type="string">No</data>
355355
<data name="product/data/stock_data/manage_stock" xsi:type="string">No</data>
@@ -374,7 +374,7 @@
374374
<data name="product/data/price/dataset" xsi:type="string">dynamic-50</data>
375375
<data name="product/data/weight_type" xsi:type="string">No</data>
376376
<data name="product/data/weight" xsi:type="string">10</data>
377-
<data name="product/data/tier_price/dataset" xsi:type="string">default</data>
377+
<data name="product/data/tier_price/dataset" xsi:type="string">custom_with_percentage_discount</data>
378378
<data name="product/data/price_view" xsi:type="string">As Low as</data>
379379
<data name="product/data/stock_data/use_config_manage_stock" xsi:type="string">No</data>
380380
<data name="product/data/stock_data/manage_stock" xsi:type="string">No</data>

‎dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnAdminLoginTest.php

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66

77
namespace Magento\Captcha\Test\TestCase;
88

9-
use Magento\Backend\Test\Page\Adminhtml\SystemConfigEdit;
10-
use Magento\Captcha\Test\Constraint\AssertCaptchaFieldOnBackend;
11-
use Magento\Captcha\Test\Page\Captcha\AdminAuthLoginWithCaptcha;
9+
use Magento\Backend\Test\Page\AdminAuthLogin;
1210
use Magento\Mtf\TestCase\Injectable;
1311
use Magento\Mtf\TestStep\TestStepFactory;
1412
use Magento\User\Test\Fixture\User;
13+
use Magento\Captcha\Test\Constraint\AssertCaptchaFieldOnBackend;
14+
use Magento\Captcha\Test\Page\Captcha\AdminAuthLoginWithCaptcha;
15+
use Magento\Backend\Test\Page\Adminhtml\SystemConfigEdit;
1516

1617
/**
1718
* Check CAPTCHA on Admin Login Page.
@@ -30,82 +31,81 @@
3031
class CaptchaOnAdminLoginTest extends Injectable
3132
{
3233
/**
33-
* Step factory.
34+
* Admin login page with Captcha.
3435
*
35-
* @var TestStepFactory
36+
* @var AdminAuthLoginWithCaptcha
3637
*/
37-
private $stepFactory;
38+
private $adminAuthWithCaptcha;
3839

3940
/**
40-
* Assert Captcha.
41+
* System configuration page.
4142
*
42-
* @var AssertCaptchaFieldOnBackend
43+
* @var SystemConfigEdit
4344
*/
44-
private $assertCaptcha;
45+
private $systemConfigEditPage;
4546

4647
/**
47-
* Admin login page.
48+
* Login page for Admin.
4849
*
49-
* @var AdminAuthLoginWithCaptcha
50+
* @var AdminAuthLogin
5051
*/
51-
protected $adminAuthWithCaptcha;
52+
private $adminAuthLogin;
5253

5354
/**
54-
* System configuration page.
55+
* Factory for Test Steps.
5556
*
56-
* @var SystemConfigEdit
57+
* @var TestStepFactory
5758
*/
58-
private $systemConfigEditPage;
59+
private $stepFactory;
5960

6061
/**
61-
* Configuration setting.
62+
* Assert captcha on backend login page.
6263
*
63-
* @var string
64+
* @var AssertCaptchaFieldOnBackend
6465
*/
65-
private $configData;
66+
private $assertCaptcha;
6667

6768
/**
6869
* Injection data.
6970
*
71+
* @param SystemConfigEdit $systemConfigEditPage
7072
* @param AdminAuthLoginWithCaptcha $adminAuthWithCaptcha
7173
* @param TestStepFactory $stepFactory
74+
* @param AdminAuthLogin $adminAuthLogin
7275
* @param AssertCaptchaFieldOnBackend $assertCaptcha
73-
* @param SystemConfigEdit $systemConfigEditPage
7476
* @return void
7577
*/
7678
public function __inject(
79+
SystemConfigEdit $systemConfigEditPage,
7780
AdminAuthLoginWithCaptcha $adminAuthWithCaptcha,
7881
TestStepFactory $stepFactory,
79-
AssertCaptchaFieldOnBackend $assertCaptcha,
80-
SystemConfigEdit $systemConfigEditPage
82+
AdminAuthLogin $adminAuthLogin,
83+
AssertCaptchaFieldOnBackend $assertCaptcha
8184
) {
82-
$this->stepFactory = $stepFactory;
85+
$this->systemConfigEditPage = $systemConfigEditPage;
8386
$this->adminAuthWithCaptcha = $adminAuthWithCaptcha;
87+
$this->stepFactory = $stepFactory;
88+
$this->adminAuthLogin = $adminAuthLogin;
8489
$this->assertCaptcha = $assertCaptcha;
85-
$this->systemConfigEditPage = $systemConfigEditPage;
8690
}
8791

8892
/**
89-
* Login user on backend.
93+
* Log in user to Admin.
9094
*
9195
* @param User $customAdmin
9296
* @param string $configData
9397
* @return void
9498
*/
95-
public function test(
96-
User $customAdmin,
97-
$configData
98-
) {
99-
$this->configData = $configData;
99+
public function test(User $customAdmin, $configData)
100+
{
100101
$customAdmin->persist();
101102

102103
// Preconditions
103104
$this->stepFactory->create(
104105
\Magento\Config\Test\TestStep\SetupConfigurationStep::class,
105-
['configData' => $this->configData]
106+
['configData' => $configData]
106107
)->run();
107-
108-
$this->adminAuthWithCaptcha->open();
108+
$this->adminAuthLogin->open();
109109
$this->adminAuthWithCaptcha->getLoginBlockWithCaptcha()->fill($customAdmin);
110110
$this->assertCaptcha->processAssert($this->adminAuthWithCaptcha);
111111
$this->adminAuthWithCaptcha->getLoginBlockWithCaptcha()->submit();

‎dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnAdminLoginTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<data name="customAdmin/data/captcha" xsi:type="string">111</data>
1313
<data name="pageTitle" xsi:type="string">Dashboard</data>
1414
<data name="configData" xsi:type="string">captcha_backend_login</data>
15-
<constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
15+
<constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
1616
</variation>
1717
</testCase>
1818
</config>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ public function assertPrice(FixtureInterface $product, View $productViewBlock)
8383
if (!$noError) {
8484
break;
8585
}
86-
if (count($match) < 2
87-
&& $match[1] != $tierPrice['price_qty']
88-
|| $match[2] !== number_format($tierPrice['price'], $this->priceFormat)
86+
$tierPriceValue = isset($tierPrice['price']) ? $tierPrice['price'] : $tierPrice['percentage_value'];
87+
if ($match[1] !== $tierPrice['price_qty']
88+
|| $match[2] !== number_format($tierPriceValue, $this->priceFormat)
8989
) {
9090
$noError = false;
9191
break;

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Catalog\Test\TestCase\Product\DuplicateProductEntityTest" summary="Duplicate Product" ticketId="MAGETWO-23294">
1010
<variation name="DuplicateProductEntityTestVariation1">
11-
<data name="tag" xsi:type="string">to_maintain:yes</data>
1211
<data name="productType" xsi:type="string">catalogProductSimple::default</data>
1312
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
1413
<constraint name="Magento\Catalog\Test\Constraint\AssertProductDuplicateMessage" />
@@ -17,4 +16,4 @@
1716
<constraint name="Magento\Catalog\Test\Constraint\AssertProductDuplicateIsNotDisplayingOnFrontend" />
1817
</variation>
1918
</testCase>
20-
</config>
19+
</config>

‎dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Links.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public function fillLinks(array $fields, SimpleElement $element = null)
7979
}
8080

8181
if (isset($link['sort_order'])) {
82-
$currentSortOrder = (int)$link['sort_order'];
82+
$currentSortOrder = (int)$link['sort_order'] - 1;
8383
unset($link['sort_order']);
8484
} else {
8585
$currentSortOrder = 0;
@@ -109,7 +109,7 @@ public function getDataLinks(array $fields = null, SimpleElement $element = null
109109
unset($link['sort_order']);
110110
$processedLink = $this->getRowBlock($index, $element)
111111
->getDataLinkRow($link);
112-
$processedLink['sort_order'] = $index;
112+
$processedLink['sort_order'] = $index + 1;
113113
$newFields['downloadable']['link'][$index] = $processedLink;
114114
}
115115
return $newFields;

‎dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Samples.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function fillSamples(array $fields = null, SimpleElement $element = null)
6666
$element->find($this->addNewSampleRow)->click();
6767

6868
if (isset($sample['sort_order'])) {
69-
$currentSortOrder = (int)$sample['sort_order'];
69+
$currentSortOrder = (int)$sample['sort_order'] - 1;
7070
unset($sample['sort_order']);
7171
} else {
7272
$currentSortOrder = 0;
@@ -94,7 +94,7 @@ public function getDataSamples(array $fields = null, SimpleElement $element = nu
9494
unset($sample['sort_order']);
9595
$processedSample = $this->getRowBlock($index, $element)
9696
->getDataSampleRow($sample);
97-
$processedSample['sort_order'] = $index;
97+
$processedSample['sort_order'] = $index + 1;
9898
$newFields['downloadable']['sample'][$index] = $processedSample;
9999
}
100100
return $newFields;

‎dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function getLinks()
111111
$linksData = [];
112112

113113
$choiceLinks = $this->_rootElement->getElements($this->choiceLink, Locator::SELECTOR_XPATH);
114-
foreach ($choiceLinks as $choiceLink) {
114+
foreach ($choiceLinks as $key => $choiceLink) {
115115
$link = $choiceLink->find($this->linkForChoice);
116116
$sample = $choiceLink->find($this->sampleLinkForChoice);
117117
$price = $choiceLink->find($this->priceForChoice);
@@ -129,7 +129,7 @@ public function getLinks()
129129
: null,
130130
];
131131

132-
$linksData[] = array_filter($linkData);
132+
$linksData[$key + 1] = array_filter($linkData);
133133
}
134134

135135
return $linksData;

‎dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Samples.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ public function getLinks()
4949
$links = $this->_rootElement->getElements($this->linkTitle);
5050
$linksData = [];
5151

52-
foreach ($links as $link) {
53-
$linksData[] = [
52+
foreach ($links as $key => $link) {
53+
$linksData[$key + 1] = [
5454
'title' => $link->getText(),
5555
];
5656
}

‎dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProduct/Links.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<item name="price" xsi:type="string">2</item>
1818
<item name="is_shareable" xsi:type="string">Use config</item>
1919
<item name="number_of_downloads" xsi:type="string">2</item>
20-
<item name="sort_order" xsi:type="string">1</item>
20+
<item name="sort_order" xsi:type="number">1</item>
2121
<item name="sample" xsi:type="array">
2222
<item name="sample_type" xsi:type="string">URL</item>
2323
<item name="sample_url" xsi:type="string">http://example.com</item>
@@ -39,7 +39,7 @@
3939
<item name="price" xsi:type="string">2</item>
4040
<item name="is_shareable" xsi:type="string">Use config</item>
4141
<item name="number_of_downloads" xsi:type="string">2</item>
42-
<item name="sort_order" xsi:type="string">1</item>
42+
<item name="sort_order" xsi:type="number">1</item>
4343
<item name="sample" xsi:type="array">
4444
<item name="sample_type" xsi:type="string">URL</item>
4545
<item name="sample_url" xsi:type="string">http://example.com</item>
@@ -67,7 +67,7 @@
6767
<item name="file_type" xsi:type="string">URL</item>
6868
<item name="file_link_url" xsi:type="string">http://example.com</item>
6969
<item name="is_shareable" xsi:type="string">No</item>
70-
<item name="sort_order" xsi:type="string">0</item>
70+
<item name="sort_order" xsi:type="number">1</item>
7171
</item>
7272
<item name="1" xsi:type="array">
7373
<item name="title" xsi:type="string">link-2-%isolation%</item>
@@ -80,7 +80,7 @@
8080
<item name="file_type" xsi:type="string">URL</item>
8181
<item name="file_link_url" xsi:type="string">http://example.com</item>
8282
<item name="is_shareable" xsi:type="string">Yes</item>
83-
<item name="sort_order" xsi:type="string">1</item>
83+
<item name="sort_order" xsi:type="number">2</item>
8484
</item>
8585
</item>
8686
</field>
@@ -102,7 +102,7 @@
102102
<item name="file_type" xsi:type="string">URL</item>
103103
<item name="file_link_url" xsi:type="string">http://example.com</item>
104104
<item name="is_shareable" xsi:type="string">No</item>
105-
<item name="sort_order" xsi:type="string">0</item>
105+
<item name="sort_order" xsi:type="number">1</item>
106106
</item>
107107
<item name="1" xsi:type="array">
108108
<item name="title" xsi:type="string">link-2-%isolation%</item>
@@ -115,7 +115,7 @@
115115
<item name="file_type" xsi:type="string">URL</item>
116116
<item name="file_link_url" xsi:type="string">http://example.com</item>
117117
<item name="is_shareable" xsi:type="string">Yes</item>
118-
<item name="sort_order" xsi:type="string">2</item>
118+
<item name="sort_order" xsi:type="number">3</item>
119119
</item>
120120
<item name="2" xsi:type="array">
121121
<item name="title" xsi:type="string">link-3-%isolation%</item>
@@ -128,7 +128,7 @@
128128
<item name="file_type" xsi:type="string">URL</item>
129129
<item name="file_link_url" xsi:type="string">http://example.com</item>
130130
<item name="is_shareable" xsi:type="string">Yes</item>
131-
<item name="sort_order" xsi:type="string">1</item>
131+
<item name="sort_order" xsi:type="number">2</item>
132132
</item>
133133
</item>
134134
</field>

‎dev/tests/functional/tests/app/Magento/Downloadable/Test/Repository/DownloadableProduct/Samples.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
<item name="title" xsi:type="string">sample1%isolation%</item>
1616
<item name="sample_type" xsi:type="string">URL</item>
1717
<item name="sample_url" xsi:type="string">http://example.com</item>
18-
<item name="sort_order" xsi:type="string">1</item>
18+
<item name="sort_order" xsi:type="number">2</item>
1919
</item>
2020
<item name="1" xsi:type="array">
2121
<item name="title" xsi:type="string">sample2%isolation%</item>
2222
<item name="sample_type" xsi:type="string">URL</item>
2323
<item name="sample_url" xsi:type="string">http://example.com</item>
24-
<item name="sort_order" xsi:type="string">0</item>
24+
<item name="sort_order" xsi:type="number">1</item>
2525
</item>
2626
</item>
2727
</field>
@@ -35,19 +35,19 @@
3535
<item name="title" xsi:type="string">sample1%isolation%</item>
3636
<item name="sample_type" xsi:type="string">URL</item>
3737
<item name="sample_url" xsi:type="string">http://example.com</item>
38-
<item name="sort_order" xsi:type="string">0</item>
38+
<item name="sort_order" xsi:type="number">1</item>
3939
</item>
4040
<item name="1" xsi:type="array">
4141
<item name="title" xsi:type="string">sample2%isolation%</item>
4242
<item name="sample_type" xsi:type="string">URL</item>
4343
<item name="sample_url" xsi:type="string">http://example.com</item>
44-
<item name="sort_order" xsi:type="string">2</item>
44+
<item name="sort_order" xsi:type="number">3</item>
4545
</item>
4646
<item name="2" xsi:type="array">
4747
<item name="title" xsi:type="string">sample3%isolation%</item>
4848
<item name="sample_type" xsi:type="string">URL</item>
4949
<item name="sample_url" xsi:type="string">http://example.com</item>
50-
<item name="sort_order" xsi:type="string">1</item>
50+
<item name="sort_order" xsi:type="number">2</item>
5151
</item>
5252
</item>
5353
</field>

0 commit comments

Comments
 (0)