Merge branch 'MC-41975' of https://github.com/magento-l3/magento2ce into TANGO_PR-05-11-2021_24

Author: thiaramus

app/code/Magento/Paypal/Controller/Transparent/Response.php

@@ -18,7 +18,7 @@
 use Magento\Paypal\Model\Payflow\Service\Response\Validator\ResponseValidator;
 use Magento\Paypal\Model\Payflow\Transparent;
 use Magento\Sales\Api\PaymentFailuresInterface;
-use Magento\Framework\Session\Generic as Session;
+use Magento\Checkout\Model\Session;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 
 /**

app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontCheckoutSelectPaypalPaymentMethodActionGroup.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontCheckoutSelectPaypalPaymentMethodActionGroup">
+        <annotations>
+            <description>Select Paypal payment method on onepage checkout</description>
+        </annotations>
+        <arguments>
+            <argument name="paymentMethod" defaultValue="{{StorefrontPaypalCheckoutSection.creditCard}}" type="string"/>
+        </arguments>
+        <click selector="{{paymentMethod}}" stepKey="selectPaypalPaymentMethod"/>
+        <waitForPageLoad stepKey="waitForPaypalFormLoad"/>
+        <scrollTo selector="{{paymentMethod}}" stepKey="scrollToCreditCardSection"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Paypal/Test/Unit/Controller/Transparent/ResponseTest.php

@@ -13,7 +13,7 @@
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Registry;
-use Magento\Framework\Session\Generic as Session;
+use Magento\Checkout\Model\Session;
 use Magento\Framework\View\Layout\ProcessorInterface;
 use Magento\Framework\View\Result\Layout;
 use Magento\Framework\View\Result\LayoutFactory;

dev/tests/integration/testsuite/Magento/Paypal/Controller/Transparent/ResponseTest.php

@@ -11,7 +11,6 @@
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Intl\DateTimeFactory;
-use Magento\Framework\Session\Generic as GenericSession;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Api\PaymentMethodManagementInterface;
@@ -59,7 +58,7 @@ public function testPaymentCcExpirationDate(
         $this->getRequest()->setPostValue($postData);
         $this->getRequest()->setMethod('POST');
         /** @var Session $checkoutSession */
-        $checkoutSession = $this->_objectManager->get(GenericSession::class);
+        $checkoutSession = $this->_objectManager->get(Session::class);
         $checkoutSession->setQuoteId($quote->getId());
         $this->setCurrentDateTime($currentDateTime);