Merge remote-tracking branch 'mainline/develop' into api-sprint-61-pr
Showing
- app/code/Magento/OfflineShipping/Model/SalesRule/Calculator.php 1 addition, 1 deletion...de/Magento/OfflineShipping/Model/SalesRule/Calculator.php
- app/code/Magento/OfflineShipping/Test/Unit/Model/SalesRule/CalculatorTest.php 10 additions, 3 deletions...lineShipping/Test/Unit/Model/SalesRule/CalculatorTest.php
- app/code/Magento/SalesRule/Model/Quote/Discount.php 2 additions, 1 deletionapp/code/Magento/SalesRule/Model/Quote/Discount.php
- app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php 11 additions, 2 deletions...Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
- app/code/Magento/SalesRule/Model/Validator.php 52 additions, 17 deletionsapp/code/Magento/SalesRule/Model/Validator.php
- app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php 12 additions, 4 deletions.../Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php
- app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php 39 additions, 22 deletionsapp/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
- dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml 24 additions, 0 deletions...nto/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
- dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/AbstractFormContainers.php 1 addition, 0 deletions...agento/Ui/Test/Block/Adminhtml/AbstractFormContainers.php
- dev/tests/integration/testsuite/Magento/Catalog/_files/categories_no_products.php 142 additions, 0 deletions...stsuite/Magento/Catalog/_files/categories_no_products.php
- dev/tests/integration/testsuite/Magento/Catalog/_files/categories_no_products_rollback.php 23 additions, 0 deletions...agento/Catalog/_files/categories_no_products_rollback.php
- dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_shipping_method_and_items_categories.php 93 additions, 0 deletions...files/quote_with_shipping_method_and_items_categories.php
- dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Rule/CollectionTest.php 117 additions, 2 deletions...nto/SalesRule/Model/ResourceModel/Rule/CollectionTest.php
- dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_categories.php 69 additions, 0 deletions...n/testsuite/Magento/SalesRule/_files/rules_categories.php
- dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_category.php 62 additions, 0 deletions...ion/testsuite/Magento/SalesRule/_files/rules_category.php
- dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_group_all_categories.php 95 additions, 0 deletions...e/Magento/SalesRule/_files/rules_group_all_categories.php
- dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_group_all_categories_price_attr_set.php 95 additions, 0 deletions...Rule/_files/rules_group_all_categories_price_attr_set.php
- dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_group_any_categories.php 95 additions, 0 deletions...e/Magento/SalesRule/_files/rules_group_any_categories.php
- dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_group_any_categories_price_address.php 98 additions, 0 deletions...sRule/_files/rules_group_any_categories_price_address.php
- dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_group_any_categories_price_attr_set.php 95 additions, 0 deletions...Rule/_files/rules_group_any_categories_price_attr_set.php
Please register or sign in to comment