Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-963

Author: Anna Bukatar

app/code/Magento/Elasticsearch/Test/Mftf/Test/StorefrontProductQuickSearchUsingElasticSearchWithSynonymsTest.xml

@@ -81,8 +81,8 @@
 
         <!-- Create 3rd synonym -->
         <actionGroup ref="AdminNavigateToNewSearchSynonymsPageActionGroup" stepKey="navigateToNewThirdSearchSynonym"/>
-        <actionGroup ref="AdminFillNewSearchSynonymsActionGroup" stepKey="fillThirdSearchSynonym">
-            <argument name="scope_id" value="1:3"/>
+        <actionGroup ref="AdminFillNewSearchSynonymsForCustomScopeActionGroup" stepKey="fillThirdSearchSynonym">
+            <argument name="scopeName" value="{{customStore.name}}"/>
             <argument name="synonyms" value="customview,simple"/>
         </actionGroup>
         <click selector="{{AdminSearchSynonymsNewSection.save}}" stepKey="clickSaveSynonymThreeButton"/>

app/code/Magento/Integration/Test/Unit/Oauth/OauthTest.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Integration\Test\Unit\Oauth;
 
+use Laminas\OAuth\Http\Utility;
 use Magento\Framework\DataObject;
 use Magento\Framework\Math\Random;
 use Magento\Framework\Oauth\Helper\Oauth;
@@ -31,6 +32,8 @@
  */
 class OauthTest extends TestCase
 {
+    private const TIMESTAMP_STUB = 1657789046;
+
     /** @var ConsumerFactory */
     private $_consumerFactory;
 
@@ -145,24 +148,26 @@ protected function setUp(): void
             )
             ->addMethods(
                 [
-                'getType',
-                'getToken',
-                'getSecret',
-                'getConsumerId',
-                'getRevoked'
+                    'getType',
+                    'getToken',
+                    'getSecret',
+                    'getConsumerId',
+                    'getRevoked'
                 ]
             )
             ->getMock();
         $this->_tokenFactory->expects($this->any())->method('create')->willReturn($this->_tokenMock);
         $this->_oauthHelperMock = $this->getMockBuilder(Oauth::class)
             ->setConstructorArgs([new Random()])
             ->getMock();
-        $this->_httpUtilityMock = $this->getMockBuilder(\Zend_Oauth_Http_Utility::class)
+        $this->_httpUtilityMock = $this->getMockBuilder(Utility::class)
             ->onlyMethods(['sign'])
             ->getMock();
         $this->_dateMock = $this->getMockBuilder(DateTime::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->_dateMock->method('timestamp')
+            ->willReturn(self::TIMESTAMP_STUB);
         $this->_loggerMock = $this->getMockBuilder(LoggerInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
@@ -821,7 +826,7 @@ public function testBuildAuthorizationHeader()
         $oauthHeader = $this->_oauth->buildAuthorizationHeader($request, $requestUrl);
 
         $expectedHeader = 'OAuth oauth_nonce="tyukmnjhgfdcvxstyuioplkmnhtfvert",' .
-            'oauth_timestamp="",' .
+            'oauth_timestamp="' . self::TIMESTAMP_STUB . '",' .
             'oauth_version="1.0",oauth_consumer_key="edf957ef88492f0a32eb7e1731e85da2",' .
             'oauth_consumer_secret="asdawwewefrtyh2f0a32eb7e1731e85d",' .
             'oauth_token="7c0709f789e1f38a17aa4b9a28e1b06c",' .

app/code/Magento/Search/Test/Mftf/ActionGroup/AdminFillNewSearchSynonymsForCustomScopeActionGroup.xml

@@ -0,0 +1,26 @@
+<?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="AdminFillNewSearchSynonymsForCustomScopeActionGroup">
+        <annotations>
+            <description>Fills the search synonyms form field with a custom Scope.</description>
+        </annotations>
+        <arguments>
+            <argument name="scopeName" type="string"/>
+            <argument name="synonyms" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminSearchSynonymsNewSection.scope}}" stepKey="clickScopeSelector"/>
+        <waitForElementVisible selector="{{AdminSearchSynonymsNewSection.selectScope(scopeName)}}" stepKey="waitForScopesList"/>
+        <click selector="{{AdminSearchSynonymsNewSection.selectScope(scopeName)}}" stepKey="clickStoreView"/>
+        <fillField selector="{{AdminSearchSynonymsNewSection.synonyms}}" userInput="{{synonyms}}" stepKey="fillSynonyms"/>
+        <checkOption selector="{{AdminSearchSynonymsNewSection.merge}}" stepKey="checkCheckbox"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Search/Test/Mftf/Section/AdminSearchSynonymsNewSection.xml

@@ -14,5 +14,6 @@
         <element name="scope" type="select" selector="//select[@name='scope_id']"/>
         <element name="synonyms" type="textarea" selector="//textarea[@name='synonyms']"/>
         <element name="merge" type="checkbox" selector="//input[@name='mergeOnConflict']"/>
+        <element name="selectScope" type="select" selector="//option[contains(text(),'{{scopeName}}')]" parameterized="true"/>
     </section>
 </sections>

composer.json

@@ -55,9 +55,10 @@
         "laminas/laminas-mime": "^2.9.1",
         "laminas/laminas-modulemanager": "^2.11.0",
         "laminas/laminas-mvc": "^3.3.3",
+        "laminas/laminas-oauth": "^2.4",
         "laminas/laminas-servicemanager": "^3.11.0",
         "laminas/laminas-soap": "^2.10.0",
-        "laminas/laminas-stdlib": "^3.7.1",
+        "laminas/laminas-stdlib": "^3.10.0",
         "laminas/laminas-uri": "^2.9.1",
         "laminas/laminas-validator": "^2.17.0",
         "league/flysystem": "~2.4.5",