Skip to content

Commit 4ee7435

Browse files
AVoskoboinikovAVoskoboinikov
committed
Merge branch 'develop' of https://github.com/magento-performance/magento2ce into perf-magetwo-58594
2 parents 7eca944 + 2c22ac4 commit 4ee7435

File tree

65 files changed

+494
-55
lines changed

Some content is hidden

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

65 files changed

+494
-55
lines changed

‎app/code/Magento/Backend/Block/Widget/Form/Container.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,16 @@ class Container extends \Magento\Backend\Block\Widget\Container
3737
* @var string
3838
*/
3939
protected $_blockGroup = 'Magento_Backend';
40+
41+
/**
42+
* @var string
43+
*/
44+
const PARAM_BLOCK_GROUP = 'block_group';
45+
46+
/**
47+
* @var string
48+
*/
49+
const PARAM_MODE = 'mode';
4050

4151
/**
4252
* @var string
@@ -49,6 +59,12 @@ class Container extends \Magento\Backend\Block\Widget\Container
4959
protected function _construct()
5060
{
5161
parent::_construct();
62+
if ($this->hasData(self::PARAM_BLOCK_GROUP)) {
63+
$this->_blockGroup = $this->_getData(self::PARAM_BLOCK_GROUP);
64+
}
65+
if ($this->hasData(self::PARAM_MODE)) {
66+
$this->_mode = $this->_getData(self::PARAM_MODE);
67+
}
5268

5369
$this->addButton(
5470
'back',

‎app/code/Magento/Deploy/Console/Command/SetModeCommand.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
104104
throw new LocalizedException(__('Cannot switch into given mode "%1"', $toMode));
105105
}
106106
$output->writeln('Enabled ' . $toMode . ' mode.');
107+
108+
return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
107109
} catch (\Exception $e) {
108110
$output->writeln('<error>' . $e->getMessage() . '</error>');
109111
if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {

‎app/code/Magento/Widget/Test/Unit/Block/Adminhtml/Widget/Instance/Edit/Chooser/AbstractContainerTest.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,14 @@ protected function setUp()
103103
->disableOriginalConstructor()
104104
->getMock();
105105

106-
$this->escaperMock = $this->getMock(\Magento\Framework\Escaper::class, ['escapeHtml'], [], '', false);
106+
$this->escaperMock = $this->getMock(
107+
\Magento\Framework\Escaper::class,
108+
['escapeHtml', 'escapeHtmlAttr'],
109+
[],
110+
'',
111+
false
112+
);
113+
$this->escaperMock->expects($this->any())->method('escapeHtmlAttr')->willReturnArgument(0);
107114

108115
$this->contextMock = $this->getMockBuilder(\Magento\Backend\Block\Context::class)
109116
->setMethods(['getEventManager', 'getScopeConfig', 'getEscaper'])

‎dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class CreateCmsBlockEntityTest extends AbstractCmsBlockEntityTest
2727
/* tags */
2828
const MVP = 'yes';
2929
const TEST_TYPE = 'extended_acceptance_test';
30+
const SEVERITY = 'S1';
3031
/* end tags */
3132

3233
/**

‎dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.xml

Lines changed: 2 additions & 2 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\Cms\Test\TestCase\CreateCmsBlockEntityTest" summary="Create CMS Block" ticketId="MAGETWO-25578">
1010
<variation name="CreateCmsBlockEntityTestVariation1">
11-
<data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
11+
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S1</data>
1212
<data name="cmsBlock/data/title" xsi:type="string">block_%isolation%</data>
1313
<data name="cmsBlock/data/identifier" xsi:type="string">identifier_%isolation%</data>
1414
<data name="cmsBlock/data/stores/dataset/option_0" xsi:type="string">All Store Views</data>
@@ -19,13 +19,13 @@
1919
<constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockOnCategoryPage" />
2020
</variation>
2121
<variation name="CreateCmsBlockEntityTestVariation2">
22+
<data name="tag" xsi:type="string">severity:S2</data>
2223
<data name="cmsBlock/data/title" xsi:type="string">block_%isolation%</data>
2324
<data name="cmsBlock/data/identifier" xsi:type="string">identifier_%isolation%</data>
2425
<data name="cmsBlock/data/stores/dataset/option_0" xsi:type="string">default</data>
2526
<data name="cmsBlock/data/is_active" xsi:type="string">No</data>
2627
<data name="cmsBlock/data/content" xsi:type="string">description_%isolation%</data>
2728
<constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockSuccessSaveMessage" />
28-
<constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockInGrid" />
2929
<constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockNotOnCategoryPage" />
3030
</variation>
3131
</testCase>

‎dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class CreateCmsPageEntityTest extends Injectable
2929
/* tags */
3030
const MVP = 'yes';
3131
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
32+
const SEVERITY = 'S1';
3233
/* end tags */
3334

3435
/**

‎dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Cms\Test\TestCase\CreateCmsPageEntityTest" summary="Create Cms Page" ticketId="MAGETWO-25580">
1010
<variation name="CreateCmsPageEntityTestVariation1" summary="Create CMS Content Page" ticketId="MAGETWO-12399">
11+
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S1</data>
1112
<data name="fixtureType" xsi:type="string">cmsPage</data>
1213
<data name="data/is_active" xsi:type="string">Yes</data>
1314
<data name="data/title" xsi:type="string">NewCmsPage%isolation%</data>
1415
<data name="data/identifier" xsi:type="string">identifier-%isolation%</data>
1516
<data name="data/store_id" xsi:type="string">All Store Views</data>
1617
<data name="data/content/content" xsi:type="string">cms_page_text_content%isolation%</data>
17-
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
1818
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageSuccessSaveMessage" />
1919
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageInGrid" />
2020
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPagePreview" />
2121
</variation>
2222
<variation name="CreateCmsPageEntityTestVariation2" summary="Create page for default store view">
23+
<data name="tag" xsi:type="string">severity:S1</data>
2324
<data name="fixtureType" xsi:type="string">cmsPage</data>
2425
<data name="data/is_active" xsi:type="string">Yes</data>
2526
<data name="data/title" xsi:type="string">NewCmsPage%isolation%</data>
@@ -30,6 +31,7 @@
3031
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageForm" />
3132
</variation>
3233
<variation name="CreateCmsPageEntityTestVariation3" summary="Create page with widget and system variable">
34+
<data name="tag" xsi:type="string">severity:S1</data>
3335
<data name="fixtureType" xsi:type="string">cmsPage</data>
3436
<data name="data/is_active" xsi:type="string">Yes</data>
3537
<data name="data/title" xsi:type="string">NewCmsPage%isolation%</data>
@@ -39,20 +41,17 @@
3941
<data name="data/content/widget/dataset" xsi:type="string">default</data>
4042
<data name="data/content/variable" xsi:type="string">General Contact Name</data>
4143
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageSuccessSaveMessage" />
42-
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageForm" />
43-
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageInGrid" />
4444
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPagePreview" />
4545
</variation>
4646
<variation name="CreateCmsPageEntityTestVariation4" summary="Create disabled page">
47+
<data name="tag" xsi:type="string">severity:S3</data>
4748
<data name="fixtureType" xsi:type="string">cmsPage</data>
4849
<data name="data/title" xsi:type="string">NewCmsPage%isolation%</data>
4950
<data name="data/identifier" xsi:type="string">identifier-%isolation%</data>
5051
<data name="data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
5152
<data name="data/is_active" xsi:type="string">No</data>
5253
<data name="data/content/content" xsi:type="string">cms_page_text_content%isolation%</data>
5354
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageSuccessSaveMessage" />
54-
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageForm" />
55-
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageInGrid" />
5655
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageDisabledOnFrontend" />
5756
</variation>
5857
</testCase>

‎dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageRewriteEntityTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class CreateCmsPageRewriteEntityTest extends Injectable
3333
/* tags */
3434
const MVP = 'yes';
3535
const TEST_TYPE = 'extended_acceptance_test';
36+
const SEVERITY = 'S1';
3637
/* end tags */
3738

3839
/**

‎dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageRewriteEntityTest.xml

Lines changed: 4 additions & 1 deletion
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\Cms\Test\TestCase\CreateCmsPageRewriteEntityTest" summary="Create CMS Page URL Rewrites" ticketId="MAGETWO-24847">
1010
<variation name="CreateCmsPageRewriteEntityTestVariation1">
11-
<data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
11+
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S1</data>
1212
<data name="urlRewrite/data/entity_type" xsi:type="string">For CMS page</data>
1313
<data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
1414
<data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%</data>
@@ -19,6 +19,7 @@
1919
<constraint name="Magento\Cms\Test\Constraint\AssertUrlRewriteCmsPageRedirect" />
2020
</variation>
2121
<variation name="CreateCmsPageRewriteEntityTestVariation2">
22+
<data name="tag" xsi:type="string">severity:S1</data>
2223
<data name="urlRewrite/data/entity_type" xsi:type="string">For CMS page</data>
2324
<data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
2425
<data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%.html</data>
@@ -29,6 +30,7 @@
2930
<constraint name="Magento\Cms\Test\Constraint\AssertUrlRewriteCmsPageRedirect" />
3031
</variation>
3132
<variation name="CreateCmsPageRewriteEntityTestVariation3">
33+
<data name="tag" xsi:type="string">severity:S1</data>
3234
<data name="urlRewrite/data/entity_type" xsi:type="string">For CMS page</data>
3335
<data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
3436
<data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%.htm</data>
@@ -39,6 +41,7 @@
3941
<constraint name="Magento\Cms\Test\Constraint\AssertUrlRewriteCmsPageRedirect" />
4042
</variation>
4143
<variation name="CreateCmsPageRewriteEntityTestVariation4">
44+
<data name="tag" xsi:type="string">severity:S1</data>
4245
<data name="urlRewrite/data/entity_type" xsi:type="string">For CMS page</data>
4346
<data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
4447
<data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%.aspx</data>

‎dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCustomUrlRewriteEntityTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\UrlRewrite\Test\TestCase\CreateCustomUrlRewriteEntityTest" summary="Create Custom URL Rewrites" ticketId="MAGETWO-25474">
1010
<variation name="CreateCustomUrlRewriteEntityTestVariation3">
11+
<data name="tag" xsi:type="string">severity:S1</data>
1112
<data name="urlRewrite/data/entity_type" xsi:type="string">Custom</data>
1213
<data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
1314
<data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
1415
<data name="urlRewrite/data/request_path" xsi:type="string">cms_page_request_path%isolation%</data>
1516
<data name="urlRewrite/data/redirect_type" xsi:type="string">No</data>
1617
<data name="urlRewrite/data/description" xsi:type="string">test description_full path</data>
1718
<constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteSaveMessage" />
18-
<constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteInGrid" />
1919
<constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCustomRedirect" />
2020
</variation>
2121
<variation name="CreateCustomUrlRewriteEntityTestVariation4">
22+
<data name="tag" xsi:type="string">severity:S1</data>
2223
<data name="urlRewrite/data/entity_type" xsi:type="string">Custom</data>
2324
<data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
2425
<data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
2526
<data name="urlRewrite/data/request_path" xsi:type="string">cms_page_request_path%isolation%</data>
2627
<data name="urlRewrite/data/redirect_type" xsi:type="string">Temporary (302)</data>
2728
<data name="urlRewrite/data/description" xsi:type="string">test description_full path</data>
2829
<constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteSaveMessage" />
29-
<constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteInGrid" />
3030
<constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCustomRedirect" />
3131
</variation>
3232
</testCase>

0 commit comments

Comments
 (0)