Skip to content

Commit b47cb1f

Browse files
authored
Merge pull request #926 from magento-engcom/develop-prs
[EngCom] Public Pull Requests
2 parents 3c34e1d + a0e1515 commit b47cb1f

File tree

467 files changed

+4
-3
lines changed

Some content is hidden

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

467 files changed

+4
-3
lines changed
-497 Bytes

dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
<constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleAppliedShoppingCart" />
115115
</variation>
116116
<variation name="ApplyCatalogRuleForSimpleProductWithCustomOptions" summary="Apply Catalog Rule for Simple Product With Custom Options" ticketId="MAGETWO-23038">
117+
<data name="tag" xsi:type="string">stable:no</data>
117118
<data name="products/0" xsi:type="string">catalogProductSimple::with_default_custom_option</data>
118119
<data name="products/1" xsi:type="string">catalogProductSimple::with_percent_and_fixed_custom_option</data>
119120
<data name="products/2" xsi:type="string">catalogProductSimple::with_custom_options_and_price_56_78</data>

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,9 @@ protected function expectedValidate()
282282
return [
283283
'type' => 'image/jpeg',
284284
'title' => 'test.jpg',
285-
'quote_path' => 'custom_options/quote/t/e/e1d601731b4b1a84163cd0e9370a4fcb.jpg',
286-
'order_path' => 'custom_options/order/t/e/e1d601731b4b1a84163cd0e9370a4fcb.jpg',
287-
'size' => '3300',
285+
'quote_path' => 'custom_options/quote/t/e/a071b9ffc8fda6df1652c05a4c61bf8a.jpg',
286+
'order_path' => 'custom_options/order/t/e/a071b9ffc8fda6df1652c05a4c61bf8a.jpg',
287+
'size' => '3046',
288288
'width' => 136,
289289
'height' => 131,
290290
];
-96 Bytes
-14 Bytes
-47 Bytes
-96 Bytes
-14 Bytes
-14 Bytes

0 commit comments

Comments
 (0)