Skip to content

Commit 1081e46

Browse files
author
vklymenko
committed
Merge remote-tracking branch 'origin/develop' into pr-dev
2 parents dcf1b04 + 1f4f104 commit 1081e46

32 files changed

+383
-92
lines changed

‎app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<!-- ko ifnot: isItemsBlockExpanded() -->
8-
<div class="block items-in-cart" data-bind="mageInit: {'collapsible':{'openedState': 'active'}}">
7+
<div class="block items-in-cart" data-bind="mageInit: {'collapsible':{'openedState': 'active', 'active': isItemsBlockExpanded()}}">
98
<div class="title" data-role="title">
109
<strong role="heading"><span data-bind="text: getItemsQty()"></span>
1110
<!-- ko if: getItemsQty() == 1 -->
@@ -32,33 +31,3 @@
3231
</div>
3332
</div>
3433
</div>
35-
<!-- /ko -->
36-
<!-- ko if: isItemsBlockExpanded() -->
37-
<div class="block items-in-cart" data-bind="mageInit: {'collapsible':{'openedState': 'active', 'active': true}}">
38-
<div class="title" data-role="title">
39-
<strong role="heading"><span data-bind="text: getItemsQty()"></span>
40-
<!-- ko if: getItemsQty() == 1 -->
41-
<!-- ko i18n: 'Item in Cart' --><!-- /ko -->
42-
<!-- /ko -->
43-
<!-- ko if: getItemsQty() > 1 -->
44-
<!-- ko i18n: 'Items in Cart' --><!-- /ko -->
45-
<!-- /ko -->
46-
</strong>
47-
</div>
48-
<div class="content minicart-items" data-role="content">
49-
<div class="minicart-items-wrapper overflowed">
50-
<ol class="minicart-items">
51-
<!-- ko foreach: getItems() -->
52-
<li class="product-item">
53-
<div class="product">
54-
<!-- ko foreach: $parent.elems() -->
55-
<!-- ko template: getTemplate() --><!-- /ko -->
56-
<!-- /ko -->
57-
</div>
58-
</li>
59-
<!-- /ko -->
60-
</ol>
61-
</div>
62-
</div>
63-
</div>
64-
<!-- /ko -->

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class AddProductsToShoppingCartEntityTest extends Injectable
3030
{
3131
/* tags */
3232
const MVP = 'yes';
33+
const SEVERITY = 'S0';
3334
/* end tags */
3435

3536
/**

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Checkout\Test\TestCase\AddProductsToShoppingCartEntityTest" summary="Add Products to Shopping Cart" ticketId="MAGETWO-25382">
1010
<variation name="AddProductsToShoppingCartEntityTestVariation1">
11-
<data name="tag" xsi:type="string">to_maintain:yes</data>
11+
<data name="tag" xsi:type="string">to_maintain:yes, severity:S2</data>
1212
<data name="productsData/0" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
1313
<data name="cart/data/grand_total" xsi:type="string">210</data>
1414
<data name="cart/data/subtotal" xsi:type="string">200</data>
@@ -21,7 +21,7 @@
2121
<constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
2222
</variation>
2323
<variation name="AddProductsToShoppingCartEntityTestVariation2">
24-
<data name="tag" xsi:type="string">to_maintain:yes</data>
24+
<data name="tag" xsi:type="string">to_maintain:yes, severity:S2</data>
2525
<data name="productsData/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
2626
<data name="cart/data/grand_total" xsi:type="string">761</data>
2727
<data name="cart/data/subtotal" xsi:type="string">756</data>
@@ -34,7 +34,7 @@
3434
<constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
3535
</variation>
3636
<variation name="AddProductsToShoppingCartEntityTestVariation3">
37-
<data name="tag" xsi:type="string">to_maintain:yes</data>
37+
<data name="tag" xsi:type="string">to_maintain:yes, severity:S0</data>
3838
<data name="productsData/0" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
3939
<data name="cart/data/grand_total" xsi:type="string">345</data>
4040
<data name="cart/data/subtotal" xsi:type="string">340</data>
@@ -47,7 +47,7 @@
4747
<constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
4848
</variation>
4949
<variation name="AddProductsToShoppingCartEntityTestVariation4">
50-
<data name="tag" xsi:type="string">to_maintain:yes</data>
50+
<data name="tag" xsi:type="string">to_maintain:yes, severity:S1</data>
5151
<data name="productsData/0" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
5252
<data name="cart/data/grand_total" xsi:type="string">50</data>
5353
<data name="cart/data/subtotal" xsi:type="string">50</data>
@@ -60,7 +60,7 @@
6060
<constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
6161
</variation>
6262
<variation name="AddProductsToShoppingCartEntityTestVariation5">
63-
<data name="tag" xsi:type="string">to_maintain:yes</data>
63+
<data name="tag" xsi:type="string">to_maintain:yes, severity:S0</data>
6464
<data name="productsData/0" xsi:type="string">configurableProduct::default</data>
6565
<data name="cart/data/grand_total" xsi:type="string">135</data>
6666
<data name="cart/data/subtotal" xsi:type="string">120</data>
@@ -73,6 +73,7 @@
7373
<constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
7474
</variation>
7575
<variation name="AddProductsToShoppingCartEntityTestVariation6">
76+
<data name="tag" xsi:type="string">severity:S2</data>
7677
<data name="productsData/0" xsi:type="string">downloadableProduct::with_two_separately_links</data>
7778
<data name="cart/data/grand_total" xsi:type="string">22.43</data>
7879
<data name="cart/data/subtotal" xsi:type="string">22.43</data>
@@ -85,7 +86,7 @@
8586
<constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
8687
</variation>
8788
<variation name="AddProductsToShoppingCartEntityTestVariation7">
88-
<data name="tag" xsi:type="string">to_maintain:yes</data>
89+
<data name="tag" xsi:type="string">to_maintain:yes, severity:S2</data>
8990
<data name="productsData/0" xsi:type="string">groupedProduct::three_simple_products</data>
9091
<data name="cart/data/grand_total" xsi:type="string">1950</data>
9192
<data name="cart/data/subtotal" xsi:type="string">1920</data>
@@ -98,7 +99,7 @@
9899
<constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
99100
</variation>
100101
<variation name="AddProductsToShoppingCartEntityTestVariation8">
101-
<data name="tag" xsi:type="string">to_maintain:yes</data>
102+
<data name="tag" xsi:type="string">to_maintain:yes, severity:S0</data>
102103
<data name="productsData/0" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
103104
<data name="productsData/1" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
104105
<data name="productsData/2" xsi:type="string">downloadableProduct::with_two_separately_links</data>

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class DeleteProductFromMiniShoppingCartTest extends Injectable
3232
{
3333
/* tags */
3434
const MVP = 'yes';
35+
const SEVERITY = 'S0';
3536
/* end tags */
3637

3738
/**

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductFromMiniShoppingCartTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Checkout\Test\TestCase\DeleteProductFromMiniShoppingCartTest" summary="Delete Product from Mini Shopping Cart" ticketId="MAGETWO-29104">
1010
<variation name="DeleteProductFromMiniShoppingCartTestVariation1">
11+
<data name="tag" xsi:type="string">severity:S0</data>
1112
<data name="description" xsi:type="string">delete Simple</data>
1213
<data name="products/0" xsi:type="string">catalogProductSimple::default</data>
1314
<data name="products/1" xsi:type="string">catalogProductVirtual::default</data>
@@ -16,6 +17,7 @@
1617
<constraint name="Magento\Checkout\Test\Constraint\AssertProductPresentInMiniShoppingCart" />
1718
</variation>
1819
<variation name="DeleteProductFromMiniShoppingCartTestVariation2">
20+
<data name="tag" xsi:type="string">severity:S1</data>
1921
<data name="description" xsi:type="string">delete Simple</data>
2022
<data name="products/0" xsi:type="string">catalogProductSimple::default</data>
2123
<data name="deletedProductIndex" xsi:type="string">0</data>

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class DeleteProductsFromShoppingCartTest extends Injectable
3030
{
3131
/* tags */
3232
const MVP = 'yes';
33+
const SEVERITY = 'S1';
3334
/* end tags */
3435

3536
/**

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,42 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Checkout\Test\TestCase\DeleteProductsFromShoppingCartTest" summary="Delete Products from Shopping Cart" ticketId="MAGETWO-25218">
1010
<variation name="DeleteProductsFromShoppingCartTestVariation1">
11+
<data name="tag" xsi:type="string">severity:S2</data>
1112
<data name="productsData/0" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
1213
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
1314
</variation>
1415
<variation name="DeleteProductsFromShoppingCartTestVariation2">
16+
<data name="tag" xsi:type="string">severity:S2</data>
1517
<data name="productsData/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
1618
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
1719
</variation>
1820
<variation name="DeleteProductsFromShoppingCartTestVariation3">
19-
<data name="tag" xsi:type="string">to_maintain:yes</data>
21+
<data name="tag" xsi:type="string">to_maintain:yes, severity:S1</data>
2022
<data name="productsData/0" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
2123
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
2224
</variation>
2325
<variation name="DeleteProductsFromShoppingCartTestVariation4">
26+
<data name="tag" xsi:type="string">severity:S2</data>
2427
<data name="productsData/0" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
2528
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
2629
</variation>
2730
<variation name="DeleteProductsFromShoppingCartTestVariation5">
31+
<data name="tag" xsi:type="string">severity:S1</data>
2832
<data name="productsData/0" xsi:type="string">configurableProduct::default</data>
2933
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
3034
</variation>
3135
<variation name="DeleteProductsFromShoppingCartTestVariation6">
36+
<data name="tag" xsi:type="string">severity:S2</data>
3237
<data name="productsData/0" xsi:type="string">downloadableProduct::with_two_separately_links</data>
3338
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
3439
</variation>
3540
<variation name="DeleteProductsFromShoppingCartTestVariation7">
41+
<data name="tag" xsi:type="string">severity:S2</data>
3642
<data name="productsData/0" xsi:type="string">groupedProduct::three_simple_products</data>
3743
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
3844
</variation>
3945
<variation name="DeleteProductsFromShoppingCartTestVariation8">
40-
<data name="tag" xsi:type="string">to_maintain:yes</data>
46+
<data name="tag" xsi:type="string">to_maintain:yes, severity:S1</data>
4147
<data name="productsData/0" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
4248
<data name="productsData/1" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
4349
<data name="productsData/2" xsi:type="string">downloadableProduct::with_two_separately_links</data>

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
*/
2222
class OnePageCheckoutJsValidationTest extends Scenario
2323
{
24+
/* tags */
25+
const SEVERITY = 'S2';
26+
/* end tags */
27+
2428
/**
2529
* Runs one page checkout js validation test.
2630
*

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutJsValidationTest" summary="JS validation verification for Checkout flow" ticketId="MAGETWO-59697">
1010
<variation name="OnePageCheckoutJsValidationTestVariation1" summary="JS validation is not applied for empty required checkout fields if customer did not fill them">
11+
<data name="tag" xsi:type="string">severity:S2</data>
1112
<data name="products/0" xsi:type="string">catalogProductSimple::default</data>
1213
<data name="checkoutMethod" xsi:type="string">guest</data>
1314
<constraint name="Magento\Checkout\Test\Constraint\AssertShippingAddressJsValidationMessagesIsAbsent" />

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ class OnePageCheckoutTest extends Scenario
4141
/* tags */
4242
const MVP = 'yes';
4343
const TEST_TYPE = 'acceptance_test, extended_acceptance_test, 3rd_party_test';
44+
const SEVERITY = 'S0';
4445
/* end tags */
4546

4647
/**

0 commit comments

Comments
 (0)