Merge branch 'MAGETWO-65821' of github.com:magento-troll/magento2ce into MAGETWO-65622

Author: slopukhov

app/code/Magento/Webapi/Model/AbstractSchemaGenerator.php

@@ -6,10 +6,10 @@
  */
 namespace Magento\Webapi\Model;
 
-use Magento\Webapi\Controller\Rest;
 use Magento\Webapi\Model\Cache\Type\Webapi;
-use Magento\Webapi\Model\ServiceMetadata;
 use Magento\Framework\Webapi\Authorization;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Abstract API schema generator.
@@ -41,6 +41,13 @@ abstract class AbstractSchemaGenerator
      */
     protected $authorization;
 
+    /**
+     * Instance of serializer.
+     *
+     * @var Json
+     */
+    private $serializer;
+
     /**
      * Initialize dependencies.
      *
@@ -49,19 +56,22 @@ abstract class AbstractSchemaGenerator
      * @param \Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface $customAttributeTypeLocator
      * @param \Magento\Webapi\Model\ServiceMetadata $serviceMetadata
      * @param Authorization $authorization
+     * @param Json|null $serializer
      */
     public function __construct(
         Webapi $cache,
         \Magento\Framework\Reflection\TypeProcessor $typeProcessor,
         \Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface $customAttributeTypeLocator,
         ServiceMetadata $serviceMetadata,
-        Authorization $authorization
+        Authorization $authorization,
+        Json $serializer = null
     ) {
         $this->cache = $cache;
         $this->typeProcessor = $typeProcessor;
         $this->customAttributeTypeLocator = $customAttributeTypeLocator;
         $this->serviceMetadata = $serviceMetadata;
         $this->authorization = $authorization;
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
     }
 
     /**
@@ -96,7 +106,8 @@ public function generate($requestedServices, $requestScheme, $requestHost, $endP
     {
         /** Sort requested services by names to prevent caching of the same schema file more than once. */
         ksort($requestedServices);
-        $cacheId = $this->cache->generateCacheIdUsingContext(get_class($this) . serialize($requestedServices));
+        $prefix = get_class($this) . $this->serializer->serialize($requestedServices);
+        $cacheId = $this->cache->generateCacheIdUsingContext($prefix);
         $cachedSchemaContent = $this->cache->load($cacheId);
         if ($cachedSchemaContent !== false) {
             return $cachedSchemaContent;

app/code/Magento/Webapi/Test/Unit/Model/Rest/Swagger/GeneratorTest.php

@@ -39,6 +39,11 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
      */
     protected $objectManager;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializer;
+
     protected function setUp()
     {
         $this->serviceMetadataMock = $this->getMockBuilder(
@@ -90,6 +95,17 @@ protected function setUp()
             ->getMock();
         $authorizationMock->expects($this->any())->method('isAllowed')->willReturn(true);
 
+        $this->serializer = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->serializer->expects($this->any())
+            ->method('serialize')
+            ->willReturnCallback(
+                function ($value) {
+                    return json_encode($value);
+                }
+            );
+
         $this->generator = $this->objectManager->getObject(
             \Magento\Webapi\Model\Rest\Swagger\Generator::class,
             [
@@ -98,12 +114,14 @@ protected function setUp()
                 'typeProcessor' => $this->typeProcessorMock,
                 'serviceMetadata' => $this->serviceMetadataMock,
                 'customAttributeTypeLocator' => $this->customAttributeTypeLocatorMock,
-                'authorization' => $authorizationMock
+                'authorization' => $authorizationMock,
+                'serializer' => $this->serializer
             ]
         );
     }
 
     /**
+     * @covers \Magento\Webapi\Model\AbstractSchemaGenerator::generate()
      * @param string[] $serviceMetadata
      * @param string[] $typeData
      * @param string $schema

app/code/Magento/Webapi/Test/Unit/Model/Soap/Wsdl/GeneratorTest.php

@@ -29,6 +29,11 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\Reflection\TypeProcessor|\PHPUnit_Framework_MockObject_MockObject */
     protected $_typeProcessor;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializer;
+
     protected function setUp()
     {
         $this->serviceMetadata = $this->getMockBuilder(
@@ -85,6 +90,24 @@ protected function setUp()
         $this->customAttributeTypeLocator = $objectManager
             ->getObject(\Magento\Eav\Model\EavCustomAttributeTypeLocator::class);
 
+        $this->serializer = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->serializer->expects($this->any())
+            ->method('serialize')
+            ->willReturnCallback(
+                function ($value) {
+                    return json_encode($value);
+                }
+            );
+        $objectManagerMock = $this->getMock(\Magento\Framework\ObjectManagerInterface::class);
+        $objectManagerMock->expects($this->any())
+            ->method('get')
+            ->willReturnMap([
+                [\Magento\Framework\Serialize\Serializer\Json::class, $this->serializer]
+            ]);
+        \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock);
+
         $this->_wsdlGenerator = $objectManager->getObject(
             \Magento\Webapi\Model\Soap\Wsdl\Generator::class,
             [
@@ -93,7 +116,8 @@ protected function setUp()
                 'typeProcessor' => $this->_typeProcessor,
                 'customAttributeTypeLocator' => $this->customAttributeTypeLocator,
                 'serviceMetadata' => $this->serviceMetadata,
-                'authorization' => $authorizationMock
+                'authorization' => $authorizationMock,
+                'serializer' => $this->serializer
             ]
         );
 
@@ -159,6 +183,7 @@ public function testGetOutputMessageName()
     /**
      * Test exception for handle
      *
+     * @covers \Magento\Webapi\Model\AbstractSchemaGenerator::generate()
      * @expectedException        \Magento\Framework\Webapi\Exception
      * @expectedExceptionMessage exception message
      */

dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ImportDataTest.xml

@@ -18,7 +18,7 @@
                 <item name="import_multiple_value_separator" xsi:type="string">,</item>
                 <item name="import_file" xsi:type="array">
                     <item name="entities" xsi:type="array">
-                        <item name="0" xsi:type="string">catalogProductSimple::default</item>
+                        <item name="0" xsi:type="string">catalogProductSimple::johndoe_with_addresses</item>
                     </item>
                     <item name="template" xsi:type="array">
                         <item name="filename" xsi:type="string">Magento/AdvancedPricingImportExport/Test/_files/template/pricing/advanced_price_variation_1</item>

dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/etc/di.xml

@@ -13,10 +13,16 @@
         </arguments>
     </type>
 
-    <type name="Magento\Mtf\Util\Command\File\ExportInterface">
+    <virtualType name="Magento\Mtf\Util\Command\File\AdvancedPricingExport" type="Magento\Mtf\Util\Command\File\Export">
         <arguments>
             <argument name="type" xsi:type="string">advancedPricing</argument>
         </arguments>
+    </virtualType>
+
+    <type name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertExportAdvancedPricing">
+        <arguments>
+            <argument name="export" xsi:type="object">Magento\Mtf\Util\Command\File\AdvancedPricingExport</argument>
+        </arguments>
     </type>
 
     <virtualType name="Magento\Mtf\Util\Command\File\Export\AdvancedPricingReader" type="Magento\Mtf\Util\Command\File\Export\Reader">

dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertAdminLoginPageIsAvailable.php

@@ -22,6 +22,7 @@ class AssertAdminLoginPageIsAvailable extends AbstractConstraint
      */
     public function processAssert(AdminAuthLogin $adminAuthLogin)
     {
+        $adminAuthLogin->open();
         \PHPUnit_Framework_Assert::assertTrue(
             $adminAuthLogin->getLoginBlock()->isVisible(),
             'Admin session does not expire properly.'

dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml

@@ -124,6 +124,7 @@
                 <item name="value" xsi:type="number">3600</item>
             </field>
         </dataset>
+
         <dataset name="admin_session_lifetime_60_seconds">
             <field name="admin/security/session_lifetime" xsi:type="array">
                 <item name="scope" xsi:type="string">default</item>
@@ -133,6 +134,29 @@
             </field>
         </dataset>
 
+        <dataset name="admin_session_lifetime_60_seconds_rollback">
+            <field name="admin/security/session_lifetime" xsi:type="array">
+                <item name="scope" xsi:type="string">default</item>
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="number">3600</item>
+                <item name="value" xsi:type="number">3600</item>
+            </field>
+        </dataset>
+
+        <dataset name="default_cookie_lifetime_60_seconds">
+            <field name="web/cookie/cookie_lifetime" xsi:type="array">
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">60</item>
+            </field>
+        </dataset>
+
+        <dataset name="default_cookie_lifetime_60_seconds_rollback">
+            <field name="web/cookie/cookie_lifetime" xsi:type="array">
+                <item name="label" xsi:type="string"/>
+                <item name="value" xsi:type="number">3600</item>
+            </field>
+        </dataset>
+
         <dataset name="admin_account_sharing_enable">
             <field name="admin/security/admin_account_sharing" xsi:type="array">
                 <item name="scope" xsi:type="string">default</item>