Skip to content

Commit 7397375

Browse files
lankenlanken
committed
MAGETWO-65135: Incorrect link/sample sorting for downloadable product while creating it by WebAPI
1 parent f59e74c commit 7397375

File tree

10 files changed

+43
-68
lines changed

10 files changed

+43
-68
lines changed

‎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)