Skip to content

Commit 109a01a

Browse files
IndraniksIndraniks
committed
Merge remote-tracking branch '36626/AC-6980_36407_Integration_not_secure_warning_showing_in_list_of_integration,_if_field_values_of_Callback_URL_and_Identity_link_URL_are_empty' into bt_comm_pr_247beta3
2 parents 27780a2 + d29d7d6 commit 109a01a

File tree

4 files changed

+84
-1
lines changed

4 files changed

+84
-1
lines changed

‎app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Name.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ public function render(\Magento\Framework\DataObject $row)
2222
{
2323
/** @var \Magento\Integration\Model\Integration $row */
2424
$text = parent::render($row);
25-
if (!$this->isUrlSecure($row->getEndpoint()) || !$this->isUrlSecure($row->getIdentityLinkUrl())) {
25+
if (($row->getEndpoint() && !$this->isUrlSecure($row->getEndpoint())) ||
26+
($row->getIdentityLinkUrl() && !$this->isUrlSecure($row->getIdentityLinkUrl()))) {
2627
$text .= '<span class="security-notice"><span>' . __("Integration not secure") . '</span></span>';
2728
}
2829
return $text;

‎app/code/Magento/Integration/Test/Mftf/ActionGroup/AssertNotEqualsAdminMessageCreateIntegrationEntityActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssertNotEqualsAdminMessageCreateIntegrationEntityActionGroup">
12+
<arguments>
13+
<argument name="message" type="string" defaultValue="Integration not secure"/>
14+
</arguments>
15+
<waitForElementVisible selector="{{AdminIntegrationsGridSection.gridName}}" stepKey="waitForMessage"/>
16+
<dontSee selector="{{AdminIntegrationsGridSection.gridName}}" userInput="{{message}}" stepKey="doNotSeeErrorMessage"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Integration/Test/Mftf/Section/AdminIntegrationsGridSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
<element name="rowByIndex" type="text" selector="tr[data-role='row']:nth-of-type({{var1}})" parameterized="true" timeout="30"/>
1919
<element name="edit" type="button" selector=".data-grid .edit"/>
2020
<element name="activate" type="button" selector="#integrationGrid_table>tbody>tr:nth-child(1)>td.col-activate>a"/>
21+
<element name="gridName" type="block" selector=".col-name" />
2122
</section>
2223
</sections>

‎app/code/Magento/Integration/Test/Mftf/Test/AdminGridIntegrationNoIntegrationSecureWarningTest.xml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminGridIntegrationNoIntegrationSecureWarningTest">
12+
<annotations>
13+
<features value="Integration"/>
14+
<stories value="Check if Callback URL and Identity link URL leave empty then no warning show for secure Integration"/>
15+
<title value="Check if Callback URL and Identity link URL leave empty then no warning show for secure Integration"/>
16+
<description value="Check if Callback URL and Identity link URL leave empty then no warning show for secure Integration"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-19889"/>
19+
<group value="integration"/>
20+
<group value="mtf_migrated"/>
21+
<group value="pr_exclude"/>
22+
<group value="cloud"/>
23+
</annotations>
24+
<before>
25+
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
26+
</before>
27+
<after>
28+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="returnToIntegrationsPage">
29+
<argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
30+
<argument name="submenuUiId" value="{{AdminMenuSystemExtensionsIntegrations.dataUiId}}"/>
31+
</actionGroup>
32+
<actionGroup ref="AdminSearchIntegrationInGridActionGroup" stepKey="searchForIntegration">
33+
<argument name="name" value="{{defaultIntegrationData.name}}"/>
34+
</actionGroup>
35+
<actionGroup ref="AdminDeleteIntegrationEntityActionGroup" stepKey="deleteCreatedIntegration"/>
36+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
37+
</after>
38+
39+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToIntegrationsPage">
40+
<argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
41+
<argument name="submenuUiId" value="{{AdminMenuSystemExtensionsIntegrations.dataUiId}}"/>
42+
</actionGroup>
43+
<actionGroup ref="AdminNavigateToCreateIntegrationPageActionGroup" stepKey="clickAddNewIntegrationButton"/>
44+
<actionGroup ref="AdminCreatesNewIntegrationActionGroup" stepKey="createNewIntegration">
45+
<argument name="name" value="{{defaultIntegrationData.name}}"/>
46+
<argument name="password" value="{{_CREDS.magento/MAGENTO_ADMIN_PASSWORD}}"/>
47+
</actionGroup>
48+
<actionGroup ref="AdminSubmitNewIntegrationFormActionGroup" stepKey="submitTheForm"/>
49+
50+
51+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="returnToIntegrationsPage">
52+
<argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
53+
<argument name="submenuUiId" value="{{AdminMenuSystemExtensionsIntegrations.dataUiId}}"/>
54+
</actionGroup>
55+
<actionGroup ref="AdminSearchIntegrationInGridActionGroup" stepKey="searchForIntegration">
56+
<argument name="name" value="{{defaultIntegrationData.name}}"/>
57+
</actionGroup>
58+
59+
<actionGroup ref="AssertNotEqualsAdminMessageCreateIntegrationEntityActionGroup" stepKey="seeErrorMessage">
60+
<argument name="message" value="Integration not secure"/>
61+
</actionGroup>
62+
</test>
63+
</tests>

0 commit comments

Comments
 (0)