Skip to content

Commit 959dfac

Browse files
imeron2433imeron2433
committed
Merge branch '2.3-develop' into MQE-975
2 parents 4150f33 + d8de08f commit 959dfac

File tree

129 files changed

+1075
-219
lines changed

Some content is hidden

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

129 files changed

+1075
-219
lines changed

‎dev/tests/integration/framework/Magento/TestFramework/Db/Adapter/Mysql.php

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
// @codingStandardsIgnoreFile
8+
79
/**
810
* See \Magento\TestFramework\Db\Adapter\TransactionInterface
911
*/
1012
namespace Magento\TestFramework\Db\Adapter;
1113

12-
class Mysql extends \Magento\Framework\DB\Adapter\Pdo\Mysql implements
13-
\Magento\TestFramework\Db\Adapter\TransactionInterface
14+
class Mysql extends \Magento\Framework\DB\Adapter\Pdo\Mysql implements \Magento\TestFramework\Db\Adapter\TransactionInterface
1415
{
1516
/**
1617
* @var int
@@ -49,14 +50,4 @@ public function rollbackTransparentTransaction()
4950
$this->_levelAdjustment -= 1;
5051
return $this->rollback();
5152
}
52-
53-
/**
54-
* Adjust transaction level with "transparent" counter
55-
*
56-
* @return int
57-
*/
58-
public function getTransactionLevel()
59-
{
60-
return parent::getTransactionLevel() - $this->_levelAdjustment;
61-
}
6253
}

‎dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Db/Adapter/TransactionInterfaceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function testBeginTransparentTransaction($class)
2626
$connectionMock->expects($this->once())->method('beginTransaction')->will($this->returnValue($uniqid));
2727
$this->assertSame(0, $connectionMock->getTransactionLevel());
2828
$this->assertEquals($uniqid, $connectionMock->beginTransparentTransaction());
29-
$this->assertSame(-1, $connectionMock->getTransactionLevel());
29+
$this->assertSame(0, $connectionMock->getTransactionLevel());
3030
}
3131

3232
/**

‎dev/tests/integration/testsuite/Magento/Bundle/Model/Category/ProductIndexerTest.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
use Magento\Catalog\Model\Category;
99

1010
/**
11-
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
12-
* @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category.php
1311
* @magentoAppIsolation enabled
14-
* @magentoDbIsolation enabled
1512
*/
1613
class ProductIndexerTest extends \PHPUnit\Framework\TestCase
1714
{
@@ -57,6 +54,9 @@ protected function setUp()
5754

5855
/**
5956
* @magentoAppArea adminhtml
57+
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
58+
* @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category.php
59+
* @magentoDbIsolation disabled
6060
*/
6161
public function testReindex()
6262
{
@@ -88,6 +88,9 @@ public function testReindex()
8888

8989
/**
9090
* @magentoAppArea adminhtml
91+
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
92+
* @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category.php
93+
* @magentoDbIsolation disabled
9194
*/
9295
public function testCategoryMove()
9396
{
@@ -130,8 +133,10 @@ public function testCategoryMove()
130133
/**
131134
* @magentoAppArea adminhtml
132135
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
136+
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
133137
* @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category.php
134138
* @depends testReindex
139+
* @magentoDbIsolation disabled
135140
*/
136141
public function testCategoryDelete()
137142
{
@@ -161,7 +166,9 @@ public function testCategoryDelete()
161166
/**
162167
* @magentoAppArea adminhtml
163168
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
169+
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
164170
* @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category.php
171+
* @magentoDbIsolation disabled
165172
*/
166173
public function testCategoryCreate()
167174
{

‎dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
namespace Magento\Bundle\Model\Product;
88

99
/**
10-
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
1110
* @magentoAppArea frontend
1211
*/
1312
class DynamicBundlePriceCalculatorTest extends BundlePriceAbstract
@@ -17,6 +16,8 @@ class DynamicBundlePriceCalculatorTest extends BundlePriceAbstract
1716
* @param array $expectedResults
1817
* @dataProvider getTestCases
1918
* @magentoAppIsolation enabled
19+
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
20+
* @magentoDbIsolation disabled
2021
*/
2122
public function testPriceForDynamicBundle(array $strategyModifiers, array $expectedResults)
2223
{
@@ -56,6 +57,8 @@ public function testPriceForDynamicBundle(array $strategyModifiers, array $expec
5657
* @dataProvider getTestCases
5758
* @magentoAppIsolation enabled
5859
* @magentoConfigFixture current_store catalog/price/scope 1
60+
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
61+
* @magentoDbIsolation disabled
5962
*/
6063
public function testPriceForDynamicBundleInWebsiteScope(array $strategyModifiers, array $expectedResults)
6164
{

‎dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithSpecialPriceCalculatorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
namespace Magento\Bundle\Model\Product;
88

99
/**
10-
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_special_price.php
1110
* @magentoAppArea frontend
1211
*/
1312
class DynamicBundleWithSpecialPriceCalculatorTest extends BundlePriceAbstract
@@ -17,6 +16,8 @@ class DynamicBundleWithSpecialPriceCalculatorTest extends BundlePriceAbstract
1716
* @param array $expectedResults
1817
* @dataProvider getTestCases
1918
* @magentoAppIsolation enabled
19+
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product_with_special_price.php
20+
* @magentoDbIsolation disabled
2021
*/
2122
public function testPriceForDynamicBundle(array $strategyModifiers, array $expectedResults)
2223
{

‎dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithTierPriceCalculatorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
1010

1111
/**
12-
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
1312
* @magentoAppArea frontend
1413
*/
1514
class DynamicBundleWithTierPriceCalculatorTest extends BundlePriceAbstract
@@ -28,6 +27,8 @@ protected function setUp()
2827
* @param array $expectedResults
2928
* @dataProvider getTestCases
3029
* @magentoAppIsolation enabled
30+
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/dynamic_bundle_product.php
31+
* @magentoDbIsolation disabled
3132
*/
3233
public function testPriceForDynamicBundle(array $strategyModifiers, array $expectedResults)
3334
{

‎dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use \Magento\Bundle\Api\Data\LinkInterface;
1010

1111
/**
12-
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
1312
* @magentoAppArea frontend
1413
*/
1514
class FixedBundlePriceCalculatorTest extends BundlePriceAbstract
@@ -19,6 +18,8 @@ class FixedBundlePriceCalculatorTest extends BundlePriceAbstract
1918
* @param array $expectedResults
2019
* @dataProvider getTestCases
2120
* @magentoAppIsolation enabled
21+
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
22+
* @magentoDbIsolation disabled
2223
*/
2324
public function testPriceForFixedBundle(array $strategyModifiers, array $expectedResults)
2425
{
@@ -54,6 +55,8 @@ public function testPriceForFixedBundle(array $strategyModifiers, array $expecte
5455
* @dataProvider getTestCases
5556
* @magentoAppIsolation enabled
5657
* @magentoConfigFixture current_store catalog/price/scope 1
58+
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
59+
* @magentoDbIsolation disabled
5760
*/
5861
public function testPriceForFixedBundleInWebsiteScope(array $strategyModifiers, array $expectedResults)
5962
{

‎dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithCatalogPriceRuleCalculatorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use \Magento\Bundle\Api\Data\LinkInterface;
1010

1111
/**
12-
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_catalog_rule.php
1312
* @magentoAppArea frontend
1413
*/
1514
class FixedBundleWithCatalogPriceRuleCalculatorTest extends BundlePriceAbstract
@@ -19,6 +18,8 @@ class FixedBundleWithCatalogPriceRuleCalculatorTest extends BundlePriceAbstract
1918
* @param array $expectedResults
2019
* @dataProvider getTestCases
2120
* @magentoAppIsolation enabled
21+
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_catalog_rule.php
22+
* @magentoDbIsolation disabled
2223
*/
2324
public function testPriceForFixedBundle(array $strategyModifiers, array $expectedResults)
2425
{

‎dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithSpecialPriceCalculatorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use \Magento\Bundle\Api\Data\LinkInterface;
1010

1111
/**
12-
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_special_price.php
1312
* @magentoAppArea frontend
1413
*/
1514
class FixedBundleWithSpecialPriceCalculatorTest extends BundlePriceAbstract
@@ -19,6 +18,8 @@ class FixedBundleWithSpecialPriceCalculatorTest extends BundlePriceAbstract
1918
* @param array $expectedResults
2019
* @dataProvider getTestCases
2120
* @magentoAppIsolation enabled
21+
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product_with_special_price.php
22+
* @magentoDbIsolation disabled
2223
*/
2324
public function testPriceForFixedBundle(array $strategyModifiers, array $expectedResults)
2425
{

‎dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundleWithTierPriceCalculatorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
/**
1313
* Class FixedBundleWithTierPRiceCalculatorTest
1414
* @package Magento\Bundle\Model\Product
15-
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
1615
* @magentoAppArea frontend
1716
*/
1817
class FixedBundleWithTierPriceCalculatorTest extends BundlePriceAbstract
@@ -31,6 +30,8 @@ protected function setUp()
3130
* @param array $expectedResults
3231
* @dataProvider getTestCases
3332
* @magentoAppIsolation enabled
33+
* @magentoDataFixture Magento/Bundle/_files/PriceCalculator/fixed_bundle_product.php
34+
* @magentoDbIsolation disabled
3435
*/
3536
public function testPriceForFixedBundle(array $strategyModifiers, array $expectedResults)
3637
{

0 commit comments

Comments
 (0)