Skip to content

Commit 0400947

Browse files
author
Yu Tang
committed
MAGETWO-48269: stabilization
- Fix integration test failures
1 parent bd22075 commit 0400947

12 files changed

+22
-5
lines changed

dev/tests/integration/testsuite/Magento/SalesRule/_files/rule_specific_date.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
'1'
2626
)->setCustomerGroupIds(
2727
'0'
28+
)->setDiscountStep(
29+
0
2830
)->setFromDate(
2931
date('Y-m-d')
3032
)->setToDate(

dev/tests/integration/testsuite/Magento/SalesRule/_files/rules.php

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
'1'
2323
)->setCustomerGroupIds(
2424
'0'
25-
)->save();
25+
)->setDiscountStep(0)
26+
->save();
2627

2728
/** @var \Magento\SalesRule\Model\Rule $rule */
2829
$rule = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\SalesRule\Model\Rule');
@@ -42,7 +43,8 @@
4243
'1'
4344
)->setCustomerGroupIds(
4445
'0'
45-
)->save();
46+
)->setDiscountStep(0)
47+
->save();
4648

4749
/** @var \Magento\SalesRule\Model\Rule $rule */
4850
$rule = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\SalesRule\Model\Rule');
@@ -62,7 +64,8 @@
6264
'1'
6365
)->setCustomerGroupIds(
6466
'0'
65-
)->save();
67+
)->setDiscountStep(0)
68+
->save();
6669

6770
/** @var \Magento\SalesRule\Model\Rule $rule */
6871
$rule = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\SalesRule\Model\Rule');
@@ -82,7 +85,8 @@
8285
'1'
8386
)->setCustomerGroupIds(
8487
'0'
85-
)->save();
88+
)->setDiscountStep(0)
89+
->save();
8690

8791
/** @var \Magento\SalesRule\Model\Rule $rule */
8892
$rule = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\SalesRule\Model\Rule');
@@ -102,4 +106,5 @@
102106
'1'
103107
)->setCustomerGroupIds(
104108
'0'
105-
)->save();
109+
)->setDiscountStep(0)
110+
->save();

dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_categories.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
'coupon_type' => \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON,
1515
'simple_action' => 'by_percent',
1616
'discount_amount' => 50,
17+
'discount_step' => 0,
1718
'stop_rules_processing' => 1,
1819
'website_ids' => [
1920
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(

dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_category.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
'coupon_type' => \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON,
1515
'simple_action' => 'by_percent',
1616
'discount_amount' => 50,
17+
'discount_step' => 0,
1718
'stop_rules_processing' => 1,
1819
'website_ids' => [
1920
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(

dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_group_all_categories.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
'coupon_type' => \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON,
1515
'simple_action' => 'by_percent',
1616
'discount_amount' => 50,
17+
'discount_step' => 0,
1718
'stop_rules_processing' => 1,
1819
'website_ids' => [
1920
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(

dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_group_all_categories_price_attr_set.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
'coupon_type' => \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON,
1515
'simple_action' => 'by_percent',
1616
'discount_amount' => 50,
17+
'discount_step' => 0,
1718
'stop_rules_processing' => 1,
1819
'website_ids' => [
1920
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(

dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_group_any_categories.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
'coupon_type' => \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON,
1515
'simple_action' => 'by_percent',
1616
'discount_amount' => 50,
17+
'discount_step' => 0,
1718
'stop_rules_processing' => 1,
1819
'website_ids' => [
1920
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(

dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_group_any_categories_price_address.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
'coupon_type' => \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON,
1515
'simple_action' => 'by_percent',
1616
'discount_amount' => 50,
17+
'discount_step' => 0,
1718
'stop_rules_processing' => 1,
1819
'website_ids' => [
1920
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(

dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_group_any_categories_price_attr_set.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
'coupon_type' => \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON,
1515
'simple_action' => 'by_percent',
1616
'discount_amount' => 50,
17+
'discount_step' => 0,
1718
'stop_rules_processing' => 1,
1819
'website_ids' => [
1920
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(

dev/tests/integration/testsuite/Magento/SalesRule/_files/rules_group_any_categories_price_attr_set_any.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
'coupon_type' => \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON,
1515
'simple_action' => 'by_percent',
1616
'discount_amount' => 50,
17+
'discount_step' => 0,
1718
'stop_rules_processing' => 1,
1819
'website_ids' => [
1920
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(

0 commit comments

Comments
 (0)