[Magento Community Engineering] Community Contributions - 2.4-develop-expedited-prs

magento-engcom-team · web-flow · commit 6253c1d17002 · 2020-07-30T23:35:12.000-05:00
- merged with '2.4-develop-prs' branch
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php
@@ -63,7 +63,7 @@ class AjaxLoginTest extends TestCase
     /**
      * @var array
      */
-    protected $formIds;
+    protected $formIds = ['user_login'];
 
     /**
      * @var AjaxLogin
@@ -97,7 +97,6 @@ protected function setUp(): void
             ->method('getCaptcha')
             ->willReturn($this->captchaMock);
 
-        $this->formIds = ['user_login'];
         $this->serializerMock = $this->createMock(Json::class);
 
         $this->model = new AjaxLogin(
@@ -194,7 +193,10 @@ public function testAroundExecuteCaptchaIsNotRequired($username, $requestContent
 
         $this->captchaMock->expects($this->once())->method('isRequired')->with($username)
             ->willReturn(false);
-        $this->captchaMock->expects($this->never())->method('logAttempt')->with($username);
+        $expectLogAttempt = $requestContent['captcha_form_id'] ?? false;
+        $this->captchaMock
+            ->expects($expectLogAttempt ? $this->once() : $this->never())
+            ->method('logAttempt')->with($username);
         $this->captchaMock->expects($this->never())->method('isCorrect');
 
         $closure = function () {
diff --git a/app/code/Magento/Customer/etc/webapi_rest/di.xml b/app/code/Magento/Customer/etc/webapi_rest/di.xml
@@ -13,7 +13,7 @@
         <arguments>
             <argument name="userContexts" xsi:type="array">
                 <item name="customerSessionUserContext" xsi:type="array">
-                    <item name="type" xsi:type="object">Magento\Customer\Model\Authorization\CustomerSessionUserContext</item>
+                    <item name="type" xsi:type="object">Magento\Customer\Model\Authorization\CustomerSessionUserContext\Proxy</item>
                     <item name="sortOrder" xsi:type="string">20</item>
                 </item>
             </argument>
diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php
@@ -97,7 +97,7 @@ public function testExecuteVsCodeFormat()
             ->with(
                 $this->equalTo(['urn:magento:framework:Module/etc/module.xsd' => $fixtureXmlFile]),
                 $this->equalTo('test')
-            )->willReturn(null);
+            );
 
         $formats = ['vscode' => $vscodeFormatMock];
         $readFactory = $this->createMock(ReadFactory::class);
diff --git a/app/code/Magento/PageCache/etc/di.xml b/app/code/Magento/PageCache/etc/di.xml
@@ -37,9 +37,6 @@
             <argument name="layoutCacheKey" xsi:type="object">Magento\Framework\View\Layout\LayoutCacheKeyInterface</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\App\FrontControllerInterface">
-        <plugin name="page_cache_from_key_from_cookie" type="Magento\PageCache\Plugin\RegisterFormKeyFromCookie" />
-    </type>
     <type name="Magento\Framework\App\Cache\RuntimeStaleCacheStateModifier">
         <arguments>
             <argument name="cacheTypes" xsi:type="array">
diff --git a/app/code/Magento/PageCache/etc/frontend/di.xml b/app/code/Magento/PageCache/etc/frontend/di.xml
@@ -9,6 +9,7 @@
     <type name="Magento\Framework\App\FrontControllerInterface">
         <plugin name="front-controller-builtin-cache" type="Magento\PageCache\Model\App\FrontController\BuiltinPlugin"/>
         <plugin name="front-controller-varnish-cache" type="Magento\PageCache\Model\App\FrontController\VarnishPlugin"/>
+        <plugin name="page_cache_form_key_from_cookie" type="Magento\PageCache\Plugin\RegisterFormKeyFromCookie" />
     </type>
     <type name="Magento\Framework\Controller\ResultInterface">
         <plugin name="result-builtin-cache" type="Magento\PageCache\Model\Controller\Result\BuiltinPlugin"/>
diff --git a/app/code/Magento/PageCache/etc/graphql/di.xml b/app/code/Magento/PageCache/etc/graphql/di.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\App\FrontControllerInterface">
+        <plugin name="page_cache_form_key_from_cookie" type="Magento\PageCache\Plugin\RegisterFormKeyFromCookie" />
+    </type>
+</config>
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
@@ -228,13 +228,9 @@ public function testSetGuest()
             ->method('removePersistentCookie')->willReturn($this->sessionMock);
         $this->quoteMock->expects($this->once())->method('isVirtual')->willReturn(false);
         $this->quoteMock->expects($this->once())->method('getItemsQty')->willReturn(1);
-        $extensionAttributes = $this->createPartialMock(
-            CartExtensionInterface::class,
-            [
-                'setShippingAssignments',
-                'getShippingAssignments'
-            ]
-        );
+        $extensionAttributes = $this->getMockBuilder(CartExtensionInterface::class)
+            ->addMethods(['getShippingAssignments', 'setShippingAssignments'])
+            ->getMockForAbstractClass();
         $shippingAssignment = $this->createMock(ShippingAssignmentInterface::class);
         $extensionAttributes->expects($this->once())
             ->method('setShippingAssignments')
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php
@@ -59,7 +59,7 @@ protected function setUp(): void
 
         $this->stockRegistry = $this->createPartialMock(
             StockRegistry::class,
-            ['getStockItem', '__wakeup']
+            ['getStockItem']
         );
         $this->stockItemMock = $this->createPartialMock(
             \Magento\CatalogInventory\Model\Stock\Item::class,
@@ -110,10 +110,11 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
             ]
         );
         /** @var Address|MockObject $address */
-        $address = $this->createPartialMock(
-            Address::class,
-            ['setTotalQty', 'getTotalQty', 'removeItem', 'getQuote']
-        );
+        $address = $this->getMockBuilder(Address::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['removeItem', 'getQuote'])
+            ->addMethods(['setTotalQty', 'getTotalQty'])
+            ->getMock();
 
         /** @var Product|MockObject $product */
         $product = $this->createMock(Product::class);
@@ -161,10 +162,10 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
         $shippingAssignmentMock->expects($this->exactly(2))->method('getShipping')->willReturn($shipping);
         $shippingAssignmentMock->expects($this->once())->method('getItems')->willReturn([$quoteItem]);
 
-        $total = $this->createPartialMock(
-            Total::class,
-            ['setBaseVirtualAmount', 'setVirtualAmount']
-        );
+        $total = $this->getMockBuilder(Total::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['setVirtualAmount', 'setBaseVirtualAmount'])
+            ->getMock();
         $total->expects($this->once())->method('setBaseVirtualAmount')->willReturnSelf();
         $total->expects($this->once())->method('setVirtualAmount')->willReturnSelf();
 
@@ -185,7 +186,9 @@ public function testFetch()
         ];
 
         $quoteMock = $this->createMock(Quote::class);
-        $totalMock = $this->createPartialMock(Total::class, ['getSubtotal']);
+        $totalMock = $this->getMockBuilder(Total::class)
+            ->addMethods(['getSubtotal'])
+            ->getMockForAbstractClass();
         $totalMock->expects($this->once())->method('getSubtotal')->willReturn(100);
 
         $this->assertEquals($expectedResult, $this->subtotalModel->fetch($quoteMock, $totalMock));
@@ -229,13 +232,11 @@ public function testCollectWithInvalidItems()
         $address->expects($this->once())
             ->method('removeItem')
             ->with($addressItemId);
-        $addressItem = $this->createPartialMock(
-            AddressItem::class,
-            [
-                'getId',
-                'getQuoteItemId'
-            ]
-        );
+        $addressItem = $this->getMockBuilder(AddressItem::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getId'])
+            ->addMethods(['getQuoteItemId'])
+            ->getMock();
         $addressItem->setAddress($address);
         $addressItem->method('getId')
             ->willReturn($addressItemId);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php
@@ -49,10 +49,11 @@ class CreditmemoFactoryTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->orderItemMock = $this->createPartialMock(
-            Item::class,
-            ['getChildrenItems', 'isDummy', 'getHasChildren', 'getId', 'getParentItemId']
-        );
+        $this->orderItemMock = $this->getMockBuilder(Item::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getChildrenItems', 'isDummy', 'getId', 'getParentItemId'])
+            ->addMethods(['getHasChildren'])
+            ->getMock();
         $this->orderChildItemOneMock = $this->createPartialMock(
             Item::class,
             ['getQtyToRefund', 'getId']
diff --git a/app/code/Magento/User/etc/webapi_rest/di.xml b/app/code/Magento/User/etc/webapi_rest/di.xml
@@ -10,7 +10,7 @@
         <arguments>
             <argument name="userContexts" xsi:type="array">
                 <item name="adminSessionUserContext" xsi:type="array">
-                    <item name="type" xsi:type="object">Magento\User\Model\Authorization\AdminSessionUserContext</item>
+                    <item name="type" xsi:type="object">Magento\User\Model\Authorization\AdminSessionUserContext\Proxy</item>
                     <item name="sortOrder" xsi:type="string">30</item>
                 </item>
             </argument>
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/RestSessionCookieTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/RestSessionCookieTest.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Webapi;
+
+use Magento\Framework\Module\Manager;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class for RestSessionCookieTest
+ */
+class RestSessionCookieTest extends \Magento\TestFramework\TestCase\WebapiAbstract
+{
+
+    private $moduleManager;
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->moduleManager = $this->objectManager->get(Manager::class);
+        if ($this->moduleManager->isEnabled('Magento_B2b')) {
+            $this->markTestSkipped('Skipped, because this logic is rewritten on B2B.');
+        }
+    }
+
+    /**
+     * Check for non exist cookie PHPSESSID
+     */
+    public function testRestSessionNoCookie()
+    {
+        $this->_markTestAsRestOnly();
+        /** @var $curlClient CurlClientWithCookies */
+
+        $curlClient = $this->objectManager
+            ->get(\Magento\TestFramework\TestCase\HttpClient\CurlClientWithCookies::class);
+        $phpSessionCookieName =
+            [
+                'cookie_name' => 'PHPSESSID',
+            ];
+
+        $response = $curlClient->get('/rest/V1/directory/countries', []);
+
+        $cookie = $this->findCookie($phpSessionCookieName['cookie_name'], $response['cookies']);
+        $this->assertNull($cookie);
+    }
+
+    /**
+     * Find cookie with given name in the list of cookies
+     *
+     * @param string $cookieName
+     * @param array $cookies
+     * @return $cookie|null
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    private function findCookie($cookieName, $cookies)
+    {
+        foreach ($cookies as $cookieIndex => $cookie) {
+            if ($cookie['name'] === $cookieName) {
+                return $cookie;
+            }
+        }
+        return null;
+    }
+}
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/form/element/email.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/form/element/email.test.js
@@ -0,0 +1,66 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint max-nested-callbacks: 0 */
+
+define(['squire', 'ko'], function (Squire, ko) {
+    'use strict';
+
+    describe('Magento_Checkout/js/view/form/element/email', function () {
+        var injector = new Squire(),
+            mocks = {
+                'Magento_Customer/js/model/customer': {
+                    isLoggedIn: ko.observable()
+                },
+                'Magento_Customer/js/action/check-email-availability': jasmine.createSpy(),
+                'Magento_Customer/js/action/login': jasmine.createSpy(),
+                'Magento_Checkout/js/model/quote': {
+                    isVirtual: jasmine.createSpy(),
+                    shippingAddress: jasmine.createSpy()
+                },
+                'Magento_Checkout/js/checkout-data': jasmine.createSpyObj(
+                    'checkoutData',
+                    [
+                        'setInputFieldEmailValue',
+                        'setValidatedEmailValue',
+                        'setCheckedEmailValue',
+                        'getInputFieldEmailValue',
+                        'getValidatedEmailValue',
+                        'getCheckedEmailValue'
+                    ]
+                ),
+                'Magento_Checkout/js/model/full-screen-loader': jasmine.createSpy(),
+                'mage/validation': jasmine.createSpy()
+            },
+            Component;
+
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require(['Magento_Checkout/js/view/form/element/email'], function (Constr) {
+                Component = new Constr({
+                    provider: 'provName',
+                    name: '',
+                    index: '',
+                    isPasswordVisible: false,
+                    isEmailCheckComplete: null
+                });
+                done();
+            });
+        });
+
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
+        describe('"resolveInitialPasswordVisibility" method', function () {
+            it('Check return type of method.', function () {
+                expect(typeof Component.resolveInitialPasswordVisibility()).toEqual('boolean');
+            });
+        });
+    });
+});
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php
@@ -50,6 +50,7 @@ protected function setUp(): void
             'adj3' => $adj3,
             'adj4' => $adj4,
         ];
+        $this->adjustmentsData = $adjustmentsData;
 
         /** @var Pool|MockObject $adjustmentPool */
         $adjustmentPool = $this->getMockBuilder(Pool::class)
@@ -64,9 +65,7 @@ function ($code) use ($adjustmentsData) {
                 return $adjustmentsData[$code];
             }
         );
-
         $this->adjustmentPool = $adjustmentPool;
-        $this->adjustmentsData = $adjustmentsData;
     }
 
     /**
@@ -108,7 +107,7 @@ public function testGetItemByCode($adjustments, $code, $expectedResult)
 
         $item = $collection->getItemByCode($code);
 
-        $this->assertEquals($expectedResult, $item->getAdjustmentCode());
+        $this->assertEquals($expectedResult, $item->getSortOrder());
     }
 
     /**
@@ -117,11 +116,11 @@ public function testGetItemByCode($adjustments, $code, $expectedResult)
     public function getItemByCodeDataProvider()
     {
         return [
-            [['adj1'], 'adj1', $this->adjustmentsData['adj1']],
-            [['adj1', 'adj2', 'adj3', 'adj4'], 'adj1', $this->adjustmentsData['adj1']],
-            [['adj1', 'adj2', 'adj3', 'adj4'], 'adj2', $this->adjustmentsData['adj2']],
-            [['adj1', 'adj2', 'adj3', 'adj4'], 'adj3', $this->adjustmentsData['adj3']],
-            [['adj1', 'adj2', 'adj3', 'adj4'], 'adj4', $this->adjustmentsData['adj4']],
+            [['adj1'], 'adj1', 10],
+            [['adj1', 'adj2', 'adj3', 'adj4'], 'adj1', 10],
+            [['adj1', 'adj2', 'adj3', 'adj4'], 'adj2', 20],
+            [['adj1', 'adj2', 'adj3', 'adj4'], 'adj3', 5],
+            [['adj1', 'adj2', 'adj3', 'adj4'], 'adj4', Pool::DEFAULT_SORT_ORDER],
         ];
     }
 
