Skip to content

Commit 936a543

Browse files
danmooney2danmooney2
committed
Merge remote-tracking branch 'remotes/mainline/2.3-qwerty' into MC-15418
2 parents 4a9d7d4 + 3867880 commit 936a543

File tree

16 files changed

+1108
-0
lines changed

16 files changed

+1108
-0
lines changed

‎app/code/Magento/Authorizenet/Test/Mftf/Test/StorefrontVerifySecureURLRedirectAuthorizenetTest.xml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
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="StorefrontVerifySecureURLRedirectAuthorizenet">
12+
<annotations>
13+
<features value="Authorizenet"/>
14+
<stories value="Storefront Secure URLs"/>
15+
<title value="Verify Secure URLs For Storefront Authorizenet Pages"/>
16+
<description value="Verify that the Secure URL configuration applies to the Authorizenet pages on the Storefront"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-15610"/>
19+
<group value="authorizenet"/>
20+
<group value="configuration"/>
21+
<group value="secure_storefront_url"/>
22+
</annotations>
23+
<before>
24+
<createData entity="Simple_US_Customer" stepKey="customer"/>
25+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefront">
26+
<argument name="Customer" value="$$customer$$"/>
27+
</actionGroup>
28+
<executeJS function="return window.location.host" stepKey="hostname"/>
29+
<magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
30+
<magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
31+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
32+
</before>
33+
<after>
34+
<magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
35+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
36+
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
37+
</after>
38+
<executeJS function="return window.location.host" stepKey="hostname"/>
39+
<amOnUrl url="http://{$hostname}/authorizenet" stepKey="goToUnsecureAuthorizenetURL"/>
40+
<seeCurrentUrlEquals url="https://{$hostname}/authorizenet" stepKey="seeSecureAuthorizenetURL"/>
41+
</test>
42+
</tests>

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
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="StorefrontVerifySecureURLRedirectCheckout">
12+
<annotations>
13+
<features value="Checkout"/>
14+
<stories value="Storefront Secure URLs"/>
15+
<title value="Verify Secure URLs For Storefront Checkout Pages"/>
16+
<description value="Verify that the Secure URL configuration applies to the Checkout pages on the Storefront"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-15531"/>
19+
<group value="checkout"/>
20+
<group value="configuration"/>
21+
<group value="secure_storefront_url"/>
22+
</annotations>
23+
<before>
24+
<createData entity="_defaultCategory" stepKey="category"/>
25+
<createData entity="_defaultProduct" stepKey="product">
26+
<requiredEntity createDataKey="category"/>
27+
</createData>
28+
<amOnPage url="{{StorefrontCategoryPage.url($$category.name$$)}}" stepKey="goToCategoryPage"/>
29+
<waitForPageLoad stepKey="waitForPageLoad"/>
30+
<moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="moveMouseOverProduct"/>
31+
<click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="clickAddToCartButton"/>
32+
<waitForPageLoad stepKey="waitForAddToCart"/>
33+
<waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForAddedToCartSuccessMessage"/>
34+
<see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$product.name$$ to your shopping cart." stepKey="seeAddedToCartSuccessMessage"/>
35+
<see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
36+
<executeJS function="return window.location.host" stepKey="hostname"/>
37+
<magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
38+
<magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
39+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
40+
</before>
41+
<after>
42+
<magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
43+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
44+
<deleteData createDataKey="product" stepKey="deleteProduct"/>
45+
<deleteData createDataKey="category" stepKey="deleteCategory"/>
46+
</after>
47+
<executeJS function="return window.location.host" stepKey="hostname"/>
48+
<amOnUrl url="http://{$hostname}/checkout" stepKey="goToUnsecureCheckoutURL"/>
49+
<seeCurrentUrlEquals url="https://{$hostname}/checkout" stepKey="seeSecureCheckoutURL"/>
50+
<amOnUrl url="http://{$hostname}/checkout/sidebar" stepKey="goToUnsecureCheckoutSidebarURL"/>
51+
<seeCurrentUrlEquals url="http://{$hostname}/checkout/sidebar" stepKey="seeUnsecureCheckoutSidebarURL"/>
52+
</test>
53+
</tests>

‎app/code/Magento/Contact/Test/Mftf/Test/StorefrontVerifySecureURLRedirectContactTest.xml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
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="StorefrontVerifySecureURLRedirectContact">
12+
<annotations>
13+
<features value="Contact"/>
14+
<stories value="Storefront Secure URLs"/>
15+
<title value="Verify Secure URLs For Storefront Contact Pages"/>
16+
<description value="Verify that the Secure URL configuration applies to the Contact pages on the Storefront"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-15539"/>
19+
<group value="contact"/>
20+
<group value="configuration"/>
21+
<group value="secure_storefront_url"/>
22+
</annotations>
23+
<before>
24+
<amOnPage url="/" stepKey="goToHomePage"/>
25+
<executeJS function="return window.location.host" stepKey="hostname"/>
26+
<magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
27+
<magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
28+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
29+
</before>
30+
<after>
31+
<magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
32+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
33+
</after>
34+
<executeJS function="return window.location.host" stepKey="hostname"/>
35+
<amOnUrl url="http://{$hostname}/contact" stepKey="goToUnsecureContactURL"/>
36+
<seeCurrentUrlEquals url="https://{$hostname}/contact" stepKey="seeSecureContactURL"/>
37+
<amOnUrl url="http://{$hostname}/contact/index/post" stepKey="goToUnsecureContactFormURL"/>
38+
<seeCurrentUrlEquals url="https://{$hostname}/contact/index/post" stepKey="seeSecureContactFormURL"/>
39+
</test>
40+
</tests>

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
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="StorefrontVerifySecureURLRedirectCustomer">
12+
<annotations>
13+
<features value="Customer"/>
14+
<stories value="Storefront Secure URLs"/>
15+
<title value="Verify Secure URLs For Storefront Customer Pages"/>
16+
<description value="Verify that the Secure URL configuration applies to the Customer pages on the Storefront"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-15618"/>
19+
<group value="customer"/>
20+
<group value="configuration"/>
21+
<group value="secure_storefront_url"/>
22+
</annotations>
23+
<before>
24+
<amOnPage url="/" stepKey="goToHomePage"/>
25+
<executeJS function="return window.location.host" stepKey="hostname"/>
26+
<magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
27+
<magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
28+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
29+
</before>
30+
<after>
31+
<magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
32+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
33+
</after>
34+
<executeJS function="return window.location.host" stepKey="hostname"/>
35+
<amOnUrl url="http://{$hostname}/customer" stepKey="goToUnsecureCustomerURL"/>
36+
<seeCurrentUrlEquals url="https://{$hostname}/customer" stepKey="seeSecureCustomerURL"/>
37+
<amOnUrl url="http://{$hostname}/customer/section/load" stepKey="goToUnsecureCustomerSectionLoadURL"/>
38+
<seeCurrentUrlEquals url="http://{$hostname}/customer/section/load" stepKey="seeUnsecureCustomerSectionLoadURL"/>
39+
</test>
40+
</tests>

‎app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontVerifySecureURLRedirectDownloadableTest.xml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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="StorefrontVerifySecureURLRedirectDownloadable">
12+
<annotations>
13+
<features value="Downloadable"/>
14+
<stories value="Storefront Secure URLs"/>
15+
<title value="Verify Secure URLs For Storefront Downloadable Pages"/>
16+
<description value="Verify that the Secure URL configuration applies to the Downloadable pages on the Storefront"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-15616"/>
19+
<group value="downloadable"/>
20+
<group value="configuration"/>
21+
<group value="secure_storefront_url"/>
22+
</annotations>
23+
<before>
24+
<createData entity="Simple_US_Customer" stepKey="customer"/>
25+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefront">
26+
<argument name="Customer" value="$$customer$$"/>
27+
</actionGroup>
28+
<executeJS function="return window.location.host" stepKey="hostname"/>
29+
<magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
30+
<magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
31+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
32+
</before>
33+
<after>
34+
<magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
35+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
36+
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
37+
</after>
38+
<executeJS function="return window.location.host" stepKey="hostname"/>
39+
<amOnUrl url="http://{$hostname}/downloadable/customer" stepKey="goToUnsecureDownloadableCustomerURL"/>
40+
<seeCurrentUrlEquals url="https://{$hostname}/downloadable/customer" stepKey="seeSecureDownloadableCustomerURL"/>
41+
<amOnUrl url="http://{$hostname}/downloadable/download" stepKey="goToUnsecureDownloadableDownloadURL"/>
42+
<seeCurrentUrlEquals url="https://{$hostname}/downloadable/download" stepKey="seeSecureDownloadableDownloadURL"/>
43+
</test>
44+
</tests>

‎app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontVerifySecureURLRedirectMultishippingTest.xml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
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="StorefrontVerifySecureURLRedirectMultishipping">
12+
<!--todo MC-5858: some urls don't redirect to https-->
13+
<annotations>
14+
<features value="Multishipping"/>
15+
<stories value="Storefront Secure URLs"/>
16+
<title value="Verify Secure URLs For Storefront Multishipping Pages"/>
17+
<description value="Verify that the Secure URL configuration applies to the Multishipping pages on the Storefront"/>
18+
<severity value="MAJOR"/>
19+
<testCaseId value="MC-15611"/>
20+
<group value="multishipping"/>
21+
<group value="configuration"/>
22+
<group value="secure_storefront_url"/>
23+
</annotations>
24+
<before>
25+
<createData entity="_defaultCategory" stepKey="category"/>
26+
<createData entity="_defaultProduct" stepKey="product">
27+
<requiredEntity createDataKey="category"/>
28+
</createData>
29+
<createData entity="Simple_US_Customer" stepKey="customer"/>
30+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefront">
31+
<argument name="Customer" value="$$customer$$"/>
32+
</actionGroup>
33+
<amOnPage url="{{StorefrontCategoryPage.url($$category.name$$)}}" stepKey="goToCategoryPage"/>
34+
<waitForPageLoad stepKey="waitForPageLoad"/>
35+
<moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="moveMouseOverProduct"/>
36+
<click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="clickAddToCartButton"/>
37+
<waitForPageLoad stepKey="waitForAddToCart"/>
38+
<waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForAddedToCartSuccessMessage"/>
39+
<see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$product.name$$ to your shopping cart." stepKey="seeAddedToCartSuccessMessage"/>
40+
<see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
41+
<executeJS function="return window.location.host" stepKey="hostname"/>
42+
<magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
43+
<magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
44+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
45+
</before>
46+
<after>
47+
<magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
48+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
49+
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
50+
<deleteData createDataKey="product" stepKey="deleteProduct"/>
51+
<deleteData createDataKey="category" stepKey="deleteCategory"/>
52+
</after>
53+
<executeJS function="return window.location.host" stepKey="hostname"/>
54+
<amOnUrl url="http://{$hostname}/multishipping/checkout" stepKey="goToUnsecureMultishippingCheckoutURL"/>
55+
<seeInCurrentUrl url="https://{$hostname}/multishipping/checkout" stepKey="seeSecureMultishippingCheckoutURL"/>
56+
</test>
57+
</tests>

‎app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontVerifySecureURLRedirectNewsletterTest.xml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
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="StorefrontVerifySecureURLRedirectNewsletter">
12+
<annotations>
13+
<features value="Newsletter"/>
14+
<stories value="Storefront Secure URLs"/>
15+
<title value="Verify Secure URLs For Storefront Newsletter Pages"/>
16+
<description value="Verify that the Secure URL configuration applies to the Newsletter pages on the Storefront"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-15584"/>
19+
<group value="newsletter"/>
20+
<group value="configuration"/>
21+
<group value="secure_storefront_url"/>
22+
</annotations>
23+
<before>
24+
<createData entity="Simple_US_Customer" stepKey="customer"/>
25+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefront">
26+
<argument name="Customer" value="$$customer$$"/>
27+
</actionGroup>
28+
<executeJS function="return window.location.host" stepKey="hostname"/>
29+
<magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
30+
<magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
31+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
32+
</before>
33+
<after>
34+
<magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
35+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
36+
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
37+
</after>
38+
<executeJS function="return window.location.host" stepKey="hostname"/>
39+
<amOnUrl url="http://{$hostname}/newsletter/manage" stepKey="goToUnsecureNewsletterManageURL"/>
40+
<seeCurrentUrlEquals url="https://{$hostname}/newsletter/manage" stepKey="seeSecureNewsletterManageURL"/>
41+
</test>
42+
</tests>

0 commit comments

Comments
 (0)