Skip to content

Commit 0a5deef

Browse files
committed
Merge remote-tracking branch 'origin/AC-3058' into Hammer_QaulityBacklog_GraphQL_24052022
2 parents 6a6c897 + 15e2958 commit 0a5deef

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

app/code/Magento/Backend/Test/Mftf/Test/AdminPrivacyPolicyTest.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<closeAdminNotification stepKey="closeAdminNotification"/>
2626
<actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkDashboard">
2727
<argument name="text" value="Privacy Policy"/>
28-
<argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
28+
<argument name="url" value="https://www.adobe.com/privacy/policy.html"/>
2929
</actionGroup>
3030
<!-- Checking for Privacy policy footer in salesOrderPage -->
3131
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesOrder">
@@ -34,7 +34,7 @@
3434
</actionGroup>
3535
<actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkSalesOrder">
3636
<argument name="text" value="Privacy Policy"/>
37-
<argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
37+
<argument name="url" value="https://www.adobe.com/privacy/policy.html"/>
3838
</actionGroup>
3939
<!-- Checking for Privacy policy footer in catalogProductsPage -->
4040
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCatalogProducts">
@@ -43,7 +43,7 @@
4343
</actionGroup>
4444
<actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkCatalogProducts">
4545
<argument name="text" value="Privacy Policy"/>
46-
<argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
46+
<argument name="url" value="https://www.adobe.com/privacy/policy.html"/>
4747
</actionGroup>
4848
<!-- Checking for Privacy policy footer in customersAllCustomersPage -->
4949
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCustomersAllCustomers">
@@ -52,7 +52,7 @@
5252
</actionGroup>
5353
<actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkCustomersAllCustomers">
5454
<argument name="text" value="Privacy Policy"/>
55-
<argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
55+
<argument name="url" value="https://www.adobe.com/privacy/policy.html"/>
5656
</actionGroup>
5757
<!-- Checking for Privacy policy footer in marketingCatalogPriceRulePage -->
5858
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingCatalogPriceRule">
@@ -61,7 +61,7 @@
6161
</actionGroup>
6262
<actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkMarketingCatalogPriceRule">
6363
<argument name="text" value="Privacy Policy"/>
64-
<argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
64+
<argument name="url" value="https://www.adobe.com/privacy/policy.html"/>
6565
</actionGroup>
6666
<!-- Checking for Privacy policy footer in contentBlocksPage -->
6767
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentBlocks">
@@ -70,7 +70,7 @@
7070
</actionGroup>
7171
<actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkContentBlocks">
7272
<argument name="text" value="Privacy Policy"/>
73-
<argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
73+
<argument name="url" value="https://www.adobe.com/privacy/policy.html"/>
7474
</actionGroup>
7575
<!-- Checking for Privacy policy footer in reportSearcbTermsPage -->
7676
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsSearchTerms">
@@ -79,7 +79,7 @@
7979
</actionGroup>
8080
<actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkReportsSearchTerms">
8181
<argument name="text" value="Privacy Policy"/>
82-
<argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
82+
<argument name="url" value="https://www.adobe.com/privacy/policy.html"/>
8383
</actionGroup>
8484
<!-- Checking for Privacy policy footer in storesAllStoresPage -->
8585
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresAllStores">
@@ -88,7 +88,7 @@
8888
</actionGroup>
8989
<actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkStoresAllStores">
9090
<argument name="text" value="Privacy Policy"/>
91-
<argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
91+
<argument name="url" value="https://www.adobe.com/privacy/policy.html"/>
9292
</actionGroup>
9393
<!-- Checking for Privacy policy footer in systemImportPage -->
9494
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemImport">
@@ -97,7 +97,7 @@
9797
</actionGroup>
9898
<actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkSystemImport">
9999
<argument name="text" value="Privacy Policy"/>
100-
<argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
100+
<argument name="url" value="https://www.adobe.com/privacy/policy.html"/>
101101
</actionGroup>
102102
<!-- Checking for Privacy policy footer in findPartnersAndExtensionsPage -->
103103
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToFindPartnersAndExtensions">
@@ -106,7 +106,7 @@
106106
</actionGroup>
107107
<actionGroup ref="AssertLinkActionGroup" stepKey="seePrivacyPolicyLinkFindPartnersAndExtensions">
108108
<argument name="text" value="Privacy Policy"/>
109-
<argument name="url" value="https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf"/>
109+
<argument name="url" value="https://www.adobe.com/privacy/policy.html"/>
110110
</actionGroup>
111111
</test>
112112
</tests>

app/code/Magento/Backend/view/adminhtml/layout/default.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<block class="Magento\Backend\Block\Page\Footer" name="version" as="version" />
6464
<block class="Magento\Framework\View\Element\Template" name="privacyPolicy" as="privacyPolicy" template="Magento_Backend::page/privacyPolicy.phtml">
6565
<arguments>
66-
<argument name="privacypolicy_url" xsi:type="string">https://magento.com/sites/default/files/REVISED-MAGENTO-PRIVACY-POLICY.pdf</argument>
66+
<argument name="privacypolicy_url" xsi:type="string">https://www.adobe.com/privacy/policy.html</argument>
6767
</arguments>
6868
</block>
6969
<block class="Magento\Framework\View\Element\Template" name="report" as="report" template="Magento_Backend::page/report.phtml">

0 commit comments

Comments
 (0)