Skip to content

Commit 6494c9f

Browse files
cspruiellcspruiell
authored
Merge pull request magento#4214 from magento-obsessive-owls/MAGETWO-56442
[Owls] MC-16595
2 parents ef04c2c + d41ef98 commit 6494c9f

File tree

39 files changed

+315
-156
lines changed

39 files changed

+315
-156
lines changed

‎app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<test name="AdminDashboardWithChartsTest">
1212
<annotations>
1313
<features value="Backend"/>
14+
<stories value="Dashboard"/>
1415
<title value="Google chart on Magento dashboard"/>
1516
<description value="Google chart on Magento dashboard page is not broken"/>
1617
<severity value="MAJOR"/>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
<test name="AdminLoginAfterJSMinificationTest">
1212
<annotations>
1313
<features value="Backend"/>
14+
<stories value="Login"/>
1415
<title value="Admin panel should be accessible with JS minification enabled"/>
1516
<description value="Admin panel should be accessible with JS minification enabled"/>
1617
<testCaseId value="MC-14104" />
18+
<severity value="MAJOR"/>
1719
<group value="backend"/>
1820
<group value="mtf_migrated"/>
1921
</annotations>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminUserLoginWithStoreCodeInUrlTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
<test name="AdminUserLoginWithStoreCodeInUrlTest">
1212
<annotations>
1313
<features value="Backend"/>
14+
<stories value="Login"/>
1415
<title value="Admin panel should be accessible with Add Store Code to URL setting enabled"/>
1516
<description value="Admin panel should be accessible with Add Store Code to URL setting enabled"/>
1617
<testCaseId value="MC-14279" />
18+
<severity value="CRITICAL"/>
1719
<group value="backend"/>
1820
<group value="mtf_migrated"/>
1921
</annotations>

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-95933"/>
1919
<group value="Bundle"/>
20+
<skip>
21+
<issueId value="MC-16684"/>
22+
</skip>
2023
</annotations>
2124
<before>
2225
<actionGroup ref="LoginAsAdmin" stepKey="login"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<test name="AddOutOfStockProductToCompareListTest">
1212
<annotations>
1313
<features value="Catalog"/>
14+
<stories value="Compare List"/>
1415
<title value="Add out of stock product to compare list"/>
1516
<description value="Add out of stock product to compare list"/>
1617
<severity value="MAJOR"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<description value="User browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out."/>
1818
<severity value="CRITICAL"/>
1919
<testCaseId value="MAGETWO-87435"/>
20+
<skip>
21+
<issueId value="MC-16684"/>
22+
</skip>
2023
</annotations>
2124
<before>
2225
<resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<testCaseId value="MC-14715"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18+
<skip>
19+
<issueId value="MC-16684"/>
20+
</skip>
1821
</annotations>
1922

2023
<before>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartWithDisableMiniCartSidebarTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<testCaseId value="MC-14719"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18+
<skip>
19+
<issueId value="MC-16684"/>
20+
</skip>
1821
</annotations>
1922

2023
<before>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddConfigurableProductToShoppingCartTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<testCaseId value="MC-14716"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18+
<skip>
19+
<issueId value="MC-16684"/>
20+
</skip>
1821
</annotations>
1922

2023
<before>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddGroupedProductToShoppingCartTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<testCaseId value="MC-14718"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18+
<skip>
19+
<issueId value="MC-16684"/>
20+
</skip>
1821
</annotations>
1922

2023
<before>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddOneBundleMultiSelectOptionToTheShoppingCartTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<testCaseId value="MC-14727"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18+
<skip>
19+
<issueId value="MC-16684"/>
20+
</skip>
1821
</annotations>
1922

2023
<before>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddTwoBundleMultiSelectOptionsToTheShoppingCartTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<testCaseId value="MC-14728"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18+
<skip>
19+
<issueId value="MC-16684"/>
20+
</skip>
1821
</annotations>
1922

2023
<before>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontValidateEmailOnCheckoutTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<description value="Email validation for Guest on checkout flow"/>
1616
<stories value="Guest Checkout"/>
1717
<testCaseId value="MC-14695" />
18+
<severity value="CRITICAL"/>
1819
<group value="checkout"/>
1920
<group value="shoppingCart"/>
2021
<group value="mtf_migrated"/>

‎app/code/Magento/Customer/Test/Mftf/Test/DeleteCustomerGroupTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<description value="Delete a customer group"/>
1515
<stories value="Delete Customer Group"/>
1616
<testCaseId value="MC-14590" />
17+
<severity value="MAJOR"/>
1718
<group value="customers"/>
1819
<group value="mtf_migrated"/>
1920
</annotations>

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateExistingCustomerTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
<test name="StorefrontCreateExistingCustomerTest">
1212
<annotations>
1313
<features value="Customer"/>
14+
<stories value="Create a Customer via the Storefront"/>
1415
<title value="Attempt to register customer on storefront with existing email"/>
1516
<description value="Attempt to register customer on storefront with existing email"/>
1617
<testCaseId value="MC-10907" />
18+
<severity value="MAJOR"/>
1719
<group value="customers"/>
1820
<group value="mtf_migrated"/>
1921
</annotations>

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontLockCustomerOnLoginPageTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
<test name="StorefrontLockCustomerOnLoginPageTest">
1212
<annotations>
1313
<features value="Customer"/>
14+
<stories value="Customer Login"/>
1415
<title value="Lock customer on Storefront with after many attempts to log in with incorrect credentials"/>
1516
<description value="Lock customer on Storefront with after many attempts to log in with incorrect credentials"/>
1617
<testCaseId value="MC-14388" />
18+
<severity value="CRITICAL"/>
1719
<group value="customer"/>
1820
<group value="security"/>
1921
<group value="mtf_migrated"/>

‎app/code/Magento/Integration/ViewModel/JsonSerializer.php

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
namespace Magento\Integration\ViewModel;
10+
11+
/**
12+
* JsonSerializer
13+
*/
14+
class JsonSerializer implements \Magento\Framework\View\Element\Block\ArgumentInterface
15+
{
16+
17+
/**
18+
* @var \Magento\Framework\Serialize\Serializer\Json
19+
*/
20+
private $serializer;
21+
22+
/**
23+
* @param \Magento\Framework\Serialize\Serializer\Json $serializer
24+
*/
25+
public function __construct(\Magento\Framework\Serialize\Serializer\Json $serializer)
26+
{
27+
$this->serializer = $serializer;
28+
}
29+
30+
/**
31+
* Returns serialized version of data
32+
*
33+
* @param array $data
34+
* @return string
35+
*/
36+
public function serialize(array $data): string
37+
{
38+
return $this->serializer->serialize($data);
39+
}
40+
}

‎app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
*
88
* @var \Magento\Backend\Block\Widget\Form\Container $block
99
*/
10-
11-
// @codingStandardsIgnoreFile
1210
?>
13-
<div><p><?= /* @escapeNotVerified */ __('The integration you selected asks you to approve access to the following:') ?></p></div>
11+
<div><p><?= $block->escapeHtml(__('The integration you selected asks you to approve access to the following:')) ?></p></div>
1412
<div id="integration-activate-permissions-tabs">
1513
<?= $block->getChildHtml('tabs') ?>
1614
</div>

‎app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,19 @@
77
*
88
* @var \Magento\Integration\Block\Adminhtml\Integration\Activate\Permissions\Tab\Webapi $block
99
*/
10-
11-
// @codingStandardsIgnoreFile
12-
1310
?>
1411
<fieldset class="admin__fieldset form-inline entry-edit">
15-
<?php if ($block->isTreeEmpty()): ?>
16-
<p class="empty"><?= /* @escapeNotVerified */ __('No permissions requested') ?></p>
17-
<?php else: ?>
12+
<?php if ($block->isTreeEmpty()) : ?>
13+
<p class="empty"><?= $block->escapeHtml(__('No permissions requested')) ?></p>
14+
<?php else : ?>
1815
<div class="field" data-role="tree-resources-container">
1916
<div class="control">
2017
<div id="resource-tree" class="tree x-tree" data-role="resource-tree"></div>
2118
</div>
2219
</div>
2320
<?php endif ?>
2421
</fieldset>
25-
<?php if (!$block->isTreeEmpty()): ?>
22+
<?php if (!$block->isTreeEmpty()) : ?>
2623
<script>
2724
require(["jquery", "Magento_User/js/roles-tree"], function($){
2825
$.widget('mage.rolesTree', $.mage.rolesTree, {
@@ -35,8 +32,8 @@
3532
});
3633

3734
$('[data-role="resource-tree"]').rolesTree({
38-
'treeInitData': <?= /* @escapeNotVerified */ $block->getResourcesTreeJson() ?>,
39-
'treeInitSelectedData': <?= /* @escapeNotVerified */ $block->getSelectedResourcesJson() ?>
35+
'treeInitData': <?= /* @noEscape */ $block->getResourcesTreeJson() ?>,
36+
'treeInitSelectedData': <?= /* @noEscape */ $block->getSelectedResourcesJson() ?>
4037
});
4138
});
4239
</script>

‎app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
*
88
* @var \Magento\Backend\Block\Template $block
99
*/
10-
11-
// @codingStandardsIgnoreFile
1210
?>
1311
<script>
1412
require([
@@ -20,11 +18,34 @@
2018
], function ($, Confirm) {
2119

2220
window.integration = new Integration(
23-
'<?= /* @escapeNotVerified */ $block->getUrl('*/*/permissionsDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]) ?>',
24-
'<?= /* @escapeNotVerified */ $block->getUrl('*/*/tokensDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]) ?>',
25-
'<?= /* @escapeNotVerified */ $block->getUrl('*/*/tokensExchange', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]) ?>',
26-
'<?= /* @escapeNotVerified */ $block->getUrl('*/*') ?>',
27-
'<?= /* @escapeNotVerified */ $block->getUrl('*/*/loginSuccessCallback') ?>'
21+
'<?= $block->escapeUrl(
22+
$block->getUrl(
23+
'*/*/permissionsDialog',
24+
['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]
25+
)
26+
) ?>',
27+
'<?= $block->escapeUrl(
28+
$block->getUrl(
29+
'*/*/tokensDialog',
30+
['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]
31+
)
32+
) ?>',
33+
'<?= $block->escapeUrl(
34+
$block->getUrl(
35+
'*/*/tokensExchange',
36+
['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]
37+
)
38+
) ?>',
39+
'<?= $block->escapeUrl(
40+
$block->getUrl(
41+
'*/*'
42+
)
43+
) ?>',
44+
'<?= $block->escapeUrl(
45+
$block->getUrl(
46+
'*/*/loginSuccessCallback'
47+
)
48+
) ?>'
2849
);
2950

3051
/**
@@ -34,8 +55,8 @@
3455
$('div#integrationGrid').on('click', 'button#delete', function (e) {
3556

3657
new Confirm({
37-
title: '<?= /* @escapeNotVerified */ __('Are you sure?') ?>',
38-
content: "<?= /* @escapeNotVerified */ __("Are you sure you want to delete this integration? You can't undo this action.") ?>",
58+
title: '<?= $block->escapeHtml(__('Are you sure?')) ?>',
59+
content: "<?= $block->escapeHtml(__("Are you sure you want to delete this integration? You can't undo this action.")) ?>",
3960
actions: {
4061
confirm: function () {
4162
$.mage.dataPost().postData({action: $(e.target).data('url'), data: {}});

‎app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,5 @@
77
*
88
* @var \Magento\Backend\Block\Template $block
99
*/
10-
11-
// @codingStandardsIgnoreFile
12-
1310
?>
14-
<div><p><?= /* @escapeNotVerified */ __("Please setup or sign in into your 3rd party account to complete setup of this integration.") ?></p></div>
11+
<div><p><?= $block->escapeHtml(__("Please setup or sign in into your 3rd party account to complete setup of this integration.")) ?></p></div>

‎app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml

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

7-
// @codingStandardsIgnoreFile
8-
9-
?>
10-
11-
<?php
127
/** @var $block \Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Webapi */
138
?>
149

1510
<?= $block->getChildHtml() ?>
1611

1712
<fieldset class="fieldset form-inline entry-edit">
1813
<legend class="legend">
19-
<span><?= /* @escapeNotVerified */ __('Available APIs') ?></span>
14+
<span><?= $block->escapeHtml(__('Available APIs')) ?></span>
2015
</legend><br />
2116

2217
<div class="field">
23-
<label class="label" for="all_resources"><span><?= /* @escapeNotVerified */ __('Resource Access') ?></span></label>
18+
<label class="label" for="all_resources"><span><?= $block->escapeHtml(__('Resource Access')) ?></span></label>
2419

2520
<div class="control">
26-
<select id="all_resources" name="all_resources" onchange="jQuery('[data-role=tree-resources-container]').toggle()" class="select">
27-
<option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>><?= /* @escapeNotVerified */ __('Custom') ?></option>
28-
<option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>><?= /* @escapeNotVerified */ __('All') ?></option>
21+
<select id="all_resources" name="all_resources"
22+
onchange="jQuery('[data-role=tree-resources-container]').toggle()" class="select">
23+
<option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>>
24+
<?= $block->escapeHtml(__('Custom')) ?>
25+
</option>
26+
<option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>>
27+
<?= $block->escapeHtml(__('All')) ?>
28+
</option>
2929
</select>
3030
</div>
3131
</div>
3232

33-
<div class="field<?php if ($block->isEverythingAllowed()):?> no-display<?php endif?>" data-role="tree-resources-container">
34-
<label class="label"><span><?= /* @escapeNotVerified */ __('Resources') ?></span></label>
33+
<div class="field
34+
<?php if ($block->isEverythingAllowed()) :?>
35+
no-display
36+
<?php endif ?>"
37+
data-role="tree-resources-container">
38+
<label class="label"><span><?= $block->escapeHtml(__('Resources')) ?></span></label>
3539

3640
<div class="control">
37-
<div class="tree x-tree" data-role="resource-tree" data-mage-init='<?php
38-
echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode([
39-
'rolesTree' => [
40-
"treeInitData" => $block->getTree(),
41-
"treeInitSelectedData" => $block->getSelectedResources(),
42-
],
43-
]));
44-
?>'></div>
41+
<div class="tree x-tree" data-role="resource-tree" data-mage-init='<?= /* @noEscape */
42+
$block->getJsonSerializer()->serialize([
43+
'rolesTree' => [
44+
"treeInitData" => $block->getTree(),
45+
"treeInitSelectedData" => $block->getSelectedResources(),
46+
],
47+
]); ?>'>
48+
</div>
4549
</div>
4650
</div>
4751
</fieldset>

0 commit comments

Comments
 (0)