Skip to content

Commit ba0c6d7

Browse files
dhorytskyidhorytskyi
committed
Merge branch '2.2-develop' of https://github.com/magento/magento2ce into PR-2.2-ALL
2 parents 688f804 + 0175f09 commit ba0c6d7

File tree

16 files changed

+323
-21
lines changed

16 files changed

+323
-21
lines changed

‎app/code/Magento/Catalog/Test/Unit/Model/Product/ProductList/ToolbarMemorizerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public function getMemorizedDataProvider(): array
197197
/**
198198
* Test method isMemorizingAllowed.
199199
*
200-
* @aram bool|null $variableValue
200+
* @param bool|null $variableValue
201201
* @param bool $flag
202202
* @param bool $expected
203203
* @return void

‎app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@
1111
use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
1212
use Magento\ConfigurableProduct\Model\Product\Type\Collection\SalableProcessor;
1313
use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
14+
use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
1415
use Magento\ConfigurableProduct\Model\Product\Type\Configurable\AttributeFactory;
1516
use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection;
1617
use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\CollectionFactory;
1718
use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection as ProductCollection;
19+
use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory
20+
as ProductCollectionFactory;
1821
use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\ConfigurableFactory;
1922
use Magento\Customer\Model\Session;
2023
use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
@@ -27,7 +30,6 @@
2730
* @SuppressWarnings(PHPMD.LongVariable)
2831
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2932
* @SuppressWarnings(PHPMD.TooManyFields)
30-
* @codingStandardsIgnoreFile
3133
*/
3234
class ConfigurableTest extends \PHPUnit\Framework\TestCase
3335
{
@@ -154,8 +156,7 @@ protected function setUp()
154156
->disableOriginalConstructor()
155157
->setMethods(['create'])
156158
->getMock();
157-
$this->productCollectionFactory = $this->getMockBuilder(
158-
\Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory::class)
159+
$this->productCollectionFactory = $this->getMockBuilder(ProductCollectionFactory::class)
159160
->disableOriginalConstructor()
160161
->setMethods(['create'])
161162
->getMock();
@@ -281,8 +282,7 @@ public function testSave()
281282
$product->expects($this->atLeastOnce())
282283
->method('getData')
283284
->willReturnMap($dataMap);
284-
$attribute = $this->getMockBuilder(
285-
\Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class)
285+
$attribute = $this->getMockBuilder(Attribute::class)
286286
->disableOriginalConstructor()
287287
->setMethods(['addData', 'setStoreId', 'setProductId', 'save', '__wakeup', '__sleep'])
288288
->getMock();
@@ -464,8 +464,7 @@ public function testGetConfigurableAttributesAsArray($productStore)
464464
$eavAttribute->expects($this->once())->method('getSource')->willReturn($attributeSource);
465465
$eavAttribute->expects($this->atLeastOnce())->method('getStoreLabel')->willReturn('Store Label');
466466

467-
$attribute = $this->getMockBuilder(
468-
\Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class)
467+
$attribute = $this->getMockBuilder(Attribute::class)
469468
->disableOriginalConstructor()
470469
->setMethods(['getProductAttribute', '__wakeup', '__sleep'])
471470
->getMock();
@@ -524,7 +523,7 @@ public function testGetConfigurableAttributesNewProduct()
524523
$this->assertEquals([], $this->model->getConfigurableAttributes($product));
525524
}
526525

527-
public function testGetConfigurableAttributes()
526+
public function testGetConfigurableAttributes()
528527
{
529528
$configurableAttributes = '_cache_instance_configurable_attributes';
530529

@@ -591,8 +590,7 @@ public function testHasOptionsConfigurableAttribute()
591590
->setMethods(['__wakeup', 'getAttributeCode', 'getOptions', 'hasData', 'getData'])
592591
->disableOriginalConstructor()
593592
->getMock();
594-
$attributeMock = $this->getMockBuilder(
595-
\Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class)
593+
$attributeMock = $this->getMockBuilder(Attribute::class)
596594
->disableOriginalConstructor()
597595
->getMock();
598596

@@ -698,7 +696,7 @@ function ($value) {
698696
->disableOriginalConstructor()
699697
->getMock();
700698
$usedAttributeMock = $this->getMockBuilder(
701-
\Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class
699+
Attribute::class
702700
)
703701
->setMethods(['getProductAttribute'])
704702
->disableOriginalConstructor()

‎app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public function testSalesOrderBeforeSaveSetForced()
160160
* The method should check that the payment is available, as this is not always the case.
161161
*
162162
* @expectedException \Magento\Framework\Exception\LocalizedException
163-
* @exceptedExceptionMessage Please provide payment for the order.
163+
* @expectedExceptionMessage Please provide payment for the order.
164164
*/
165165
public function testDoesNothingWhenNoPaymentIsAvailable()
166166
{

‎composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
"ramsey/uuid": "~3.7.3"
7575
},
7676
"require-dev": {
77+
"allure-framework/allure-phpunit": "~1.2.0",
7778
"magento/magento2-functional-testing-framework": "2.4.0",
7879
"phpunit/phpunit": "~6.2.0",
7980
"squizlabs/php_codesniffer": "3.2.2",

‎composer.lock

Lines changed: 97 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/tests/api-functional/phpunit.xml.dist

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,61 @@
6464
<!-- Test listeners -->
6565
<listeners>
6666
<listener class="Magento\TestFramework\Event\PhpUnit"/>
67+
<listener class="Yandex\Allure\Adapter\AllureAdapter">
68+
<arguments>
69+
<string>var/allure-results</string> <!-- XML files output folder -->
70+
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
71+
<array> <!-- A list of custom annotations to ignore (optional) -->
72+
<element key="codingStandardsIgnoreFile">
73+
<string>codingStandardsIgnoreFile</string>
74+
</element>
75+
<element key="codingStandardsIgnoreStart">
76+
<string>codingStandardsIgnoreStart</string>
77+
</element>
78+
<element key="codingStandardsIgnoreEnd">
79+
<string>codingStandardsIgnoreEnd</string>
80+
</element>
81+
<element key="expectedExceptionMessageRegExp">
82+
<string>expectedExceptionMessageRegExp</string>
83+
</element>
84+
<element key="magentoAdminConfigFixture">
85+
<string>magentoAdminConfigFixture</string>
86+
</element>
87+
<element key="magentoAppArea">
88+
<string>magentoAppArea</string>
89+
</element>
90+
<element key="magentoAppIsolation">
91+
<string>magentoAppIsolation</string>
92+
</element>
93+
<element key="magentoCache">
94+
<string>magentoCache</string>
95+
</element>
96+
<element key="magentoComponentsDir">
97+
<string>magentoComponentsDir</string>
98+
</element>
99+
<element key="magentoConfigFixture">
100+
<string>magentoConfigFixture</string>
101+
</element>
102+
<element key="magentoDataFixture">
103+
<string>magentoDataFixture</string>
104+
</element>
105+
<element key="magentoDataFixtureBeforeTransaction">
106+
<string>magentoDataFixtureBeforeTransaction</string>
107+
</element>
108+
<element key="magentoDbIsolation">
109+
<string>magentoDbIsolation</string>
110+
</element>
111+
<element key="magentoIndexerDimensionMode">
112+
<string>magentoIndexerDimensionMode</string>
113+
</element>
114+
<element key="magentoApiDataFixture">
115+
<string>magentoApiDataFixture</string>
116+
</element>
117+
<element key="Override">
118+
<string>Override</string>
119+
</element>
120+
</array>
121+
</arguments>
122+
</listener>
67123
</listeners>
68124
</phpunit>

‎dev/tests/integration/framework/tests/unit/phpunit.xml.dist

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,32 @@
2020
<php>
2121
<ini name="date.timezone" value="America/Los_Angeles"/>
2222
</php>
23+
<listeners>
24+
<listener class="Yandex\Allure\Adapter\AllureAdapter">
25+
<arguments>
26+
<string>var/allure-results</string> <!-- XML files output directory -->
27+
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
28+
<array> <!-- A list of custom annotations to ignore (optional) -->
29+
<element key="magentoAdminConfigFixture">
30+
<string>magentoAdminConfigFixture</string>
31+
</element>
32+
<element key="magentoAppIsolation">
33+
<string>magentoAppIsolation</string>
34+
</element>
35+
<element key="magentoComponentsDir">
36+
<string>magentoComponentsDir</string>
37+
</element>
38+
<element key="magentoConfigFixture">
39+
<string>magentoConfigFixture</string>
40+
</element>
41+
<element key="@magentoDbIsolation">
42+
<string>magentoDataFixture</string>
43+
</element>
44+
<element key="magentoDbIsolation">
45+
<string>magentoDbIsolation</string>
46+
</element>
47+
</array>
48+
</arguments>
49+
</listener>
50+
</listeners>
2351
</phpunit>

‎dev/tests/integration/phpunit.xml.dist

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,58 @@
7777
<listeners>
7878
<listener class="Magento\TestFramework\Event\PhpUnit"/>
7979
<listener class="Magento\TestFramework\ErrorLog\Listener"/>
80+
<listener class="Yandex\Allure\Adapter\AllureAdapter">
81+
<arguments>
82+
<string>var/allure-results</string> <!-- XML files output directory -->
83+
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
84+
<array> <!-- A list of custom annotations to ignore (optional) -->
85+
<element key="codingStandardsIgnoreFile">
86+
<string>codingStandardsIgnoreFile</string>
87+
</element>
88+
<element key="codingStandardsIgnoreStart">
89+
<string>codingStandardsIgnoreStart</string>
90+
</element>
91+
<element key="codingStandardsIgnoreEnd">
92+
<string>codingStandardsIgnoreEnd</string>
93+
</element>
94+
<element key="expectedExceptionMessageRegExp">
95+
<string>expectedExceptionMessageRegExp</string>
96+
</element>
97+
<element key="magentoAdminConfigFixture">
98+
<string>magentoAdminConfigFixture</string>
99+
</element>
100+
<element key="magentoAppArea">
101+
<string>magentoAppArea</string>
102+
</element>
103+
<element key="magentoAppIsolation">
104+
<string>magentoAppIsolation</string>
105+
</element>
106+
<element key="magentoCache">
107+
<string>magentoCache</string>
108+
</element>
109+
<element key="magentoComponentsDir">
110+
<string>magentoComponentsDir</string>
111+
</element>
112+
<element key="magentoConfigFixture">
113+
<string>magentoConfigFixture</string>
114+
</element>
115+
<element key="magentoDataFixture">
116+
<string>magentoDataFixture</string>
117+
</element>
118+
<element key="magentoDataFixtureBeforeTransaction">
119+
<string>magentoDataFixtureBeforeTransaction</string>
120+
</element>
121+
<element key="magentoDbIsolation">
122+
<string>magentoDbIsolation</string>
123+
</element>
124+
<element key="magentoIndexerDimensionMode">
125+
<string>magentoIndexerDimensionMode</string>
126+
</element>
127+
<element key="security">
128+
<string>security</string>
129+
</element>
130+
</array>
131+
</arguments>
132+
</listener>
80133
</listeners>
81134
</phpunit>

‎dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/SimpleWithOptionsTierPriceWithDimensionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
1212
use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
1313
use Magento\Catalog\Pricing\Price\TierPrice;
14-
use Magento\Customer\Model\Group;
14+
use Magento\Customer\Model\Group as CustomerGroup;
1515

1616
/**
1717
* @group indexer_dimension
@@ -54,7 +54,7 @@ public function testTierPrice()
5454

5555
$tierPrice = $this->objectManager->create(ProductTierPriceInterfaceFactory::class)
5656
->create();
57-
$tierPrice->setCustomerGroupId(Group::CUST_GROUP_ALL);
57+
$tierPrice->setCustomerGroupId(CustomerGroup::CUST_GROUP_ALL);
5858
$tierPrice->setQty(1.00);
5959
$tierPrice->setValue($tierPriceValue);
6060
$tierPriceManagement = $this->objectManager->create(ScopedProductTierPriceManagementInterface::class);

0 commit comments

Comments
 (0)