From f51354150fca9218599f1d642298cff9e71b4ef2 Mon Sep 17 00:00:00 2001
From: Sergey Semenov <ssemenov@ebay.com>
Date: Wed, 1 Apr 2015 18:15:49 +0300
Subject: [PATCH 01/17] MAGETWO-35321: Unexpected response for API
 "/V1/customers/password" service

---
 .../Customer/Model/AccountManagement.php      |   2 +
 .../Test/Unit/Model/AccountManagementTest.php | 261 ++++++++++++++++--
 2 files changed, 247 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index 4d0ca1e9efbed..8b6677aec5a4e 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -420,10 +420,12 @@ public function initiatePasswordReset($email, $template, $websiteId = null)
                         )
                     );
             }
+            return true;
         } catch (MailException $e) {
             // If we are not able to send a reset password email, this should be ignored
             $this->logger->critical($e);
         }
+        return false;
     }
 
     /**
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
index 9c7c2f1dde355..cff52aad64591 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
@@ -94,6 +94,16 @@ class AccountManagementTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\Api\ExtensibleDataObjectConverter|\PHPUnit_Framework_MockObject_MockObject */
     protected $extensibleDataObjectConverter;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\Store
+     */
+    protected $store;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Customer\Model\Data\CustomerSecure
+     */
+    protected $customerSecure;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -101,6 +111,9 @@ protected function setUp()
     {
         $this->customerFactory = $this->getMock('Magento\Customer\Model\CustomerFactory', [], [], '', false);
         $this->manager = $this->getMock('Magento\Framework\Event\ManagerInterface');
+        $this->store = $this->getMockBuilder('Magento\Store\Model\Store')
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->random = $this->getMock('Magento\Framework\Math\Random');
         $this->validator = $this->getMock('Magento\Customer\Model\Metadata\Validator', [], [], '', false);
@@ -148,6 +161,10 @@ protected function setUp()
             false
         );
 
+        $this->customerSecure = $this->getMockBuilder('Magento\Customer\Model\Data\CustomerSecure')
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->accountManagement = $this->objectManagerHelper->getObject(
             'Magento\Customer\Model\AccountManagement',
@@ -208,16 +225,12 @@ public function testSendPasswordReminderEmail()
             ->method('getEmail')
             ->willReturn($customerEmail);
 
-        $store = $this->getMockBuilder('Magento\Store\Model\Store')
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->storeManager->expects($this->any())
             ->method('getStore')
             ->with($customerStoreId)
-            ->willReturn($store);
+            ->willReturn($this->store);
 
-        $store->expects($this->any())
+        $this->store->expects($this->any())
             ->method('isFrontUrlSecure')
             ->willReturn($isFrontendSecure);
 
@@ -232,15 +245,10 @@ public function testSendPasswordReminderEmail()
                 ]
             )->willReturn($resetUrl);
 
-        $customerSecure = $this->getMockBuilder('\Magento\Customer\Model\Data\CustomerSecure')
-            ->disableOriginalConstructor()
-            ->setMethods(['addData', 'setData', 'setResetPasswordUrl'])
-            ->getMock();
-
         $this->customerRegistry->expects($this->once())
             ->method('retrieveSecureData')
             ->with($customerId)
-            ->willReturn($customerSecure);
+            ->willReturn($this->customerSecure);
 
         $this->dataObjectProcessor->expects($this->once())
             ->method('buildOutputDataArray')
@@ -252,15 +260,15 @@ public function testSendPasswordReminderEmail()
             ->with($customer)
             ->willReturn($customerName);
 
-        $customerSecure->expects($this->once())
+        $this->customerSecure->expects($this->once())
             ->method('addData')
             ->with($customerData)
             ->willReturnSelf();
-        $customerSecure->expects($this->once())
+        $this->customerSecure->expects($this->once())
             ->method('setData')
             ->with('name', $customerName)
             ->willReturnSelf();
-        $customerSecure->expects($this->once())
+        $this->customerSecure->expects($this->any())
             ->method('setResetPasswordUrl')
             ->with($resetUrl);
 
@@ -286,7 +294,7 @@ public function testSendPasswordReminderEmail()
             ->willReturnSelf();
         $this->transportBuilder->expects($this->once())
             ->method('setTemplateVars')
-            ->with(['customer' => $customerSecure, 'store' => $store])
+            ->with(['customer' => $this->customerSecure, 'store' => $this->store])
             ->willReturnSelf();
         $this->transportBuilder->expects($this->once())
             ->method('setFrom')
@@ -308,4 +316,225 @@ public function testSendPasswordReminderEmail()
             $this->accountManagement->sendPasswordReminderEmail($customer, $passwordToken)
         );
     }
+
+    /**
+     * @param string $email
+     * @param string $templateIdentifier
+     * @param string $sender
+     * @param int $storeId
+     * @param int $customerId
+     * @param string $hash
+     */
+    protected function prepareInitiatePasswordReset($email, $templateIdentifier, $sender, $storeId, $customerId, $hash)
+    {
+        $websiteId = 1;
+
+        $dateTime = date(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT);
+
+        $customerData = ['key' => 'value'];
+        $customerName = 'Customer Name';
+
+        $this->store->expects($this->once())
+            ->method('getWebsiteId')
+            ->willReturn($websiteId);
+        $this->store->expects($this->any())
+            ->method('getId')
+            ->willReturn($storeId);
+
+        $this->storeManager->expects($this->any())
+            ->method('getStore')
+            ->willReturn($this->store);
+
+        $customer = $this->getMockBuilder('Magento\Customer\Api\Data\CustomerInterface')
+            ->getMock();
+        $customer->expects($this->any())
+            ->method('getEmail')
+            ->willReturn($email);
+        $customer->expects($this->any())
+            ->method('getId')
+            ->willReturn($customerId);
+        $customer->expects($this->any())
+            ->method('getStoreId')
+            ->willReturn($storeId);
+
+        $this->customerRepository->expects($this->once())
+            ->method('get')
+            ->with($email, $websiteId)
+            ->willReturn($customer);
+        $this->customerRepository->expects($this->once())
+            ->method('save')
+            ->with($customer)
+            ->willReturnSelf();
+
+        $this->random->expects($this->once())
+            ->method('getUniqueHash')
+            ->willReturn($hash);
+
+        $this->customerViewHelper->expects($this->any())
+            ->method('getCustomerName')
+            ->with($customer)
+            ->willReturn($customerName);
+
+        $this->customerSecure->expects($this->any())
+            ->method('setRpToken')
+            ->with($hash)
+            ->willReturnSelf();
+        $this->customerSecure->expects($this->any())
+            ->method('setRpTokenCreatedAt')
+            ->with($dateTime)
+            ->willReturnSelf();
+        $this->customerSecure->expects($this->any())
+            ->method('addData')
+            ->with($customerData)
+            ->willReturnSelf();
+        $this->customerSecure->expects($this->any())
+            ->method('setData')
+            ->with('name', $customerName)
+            ->willReturnSelf();
+
+        $this->customerRegistry->expects($this->any())
+            ->method('retrieveSecureData')
+            ->with($customerId)
+            ->willReturn($this->customerSecure);
+
+        $this->dataObjectProcessor->expects($this->any())
+            ->method('buildOutputDataArray')
+            ->with($customer, '\Magento\Customer\Api\Data\CustomerInterface')
+            ->willReturn($customerData);
+
+        $transport = $this->getMockBuilder('Magento\Framework\Mail\TransportInterface')
+            ->getMock();
+
+        $this->transportBuilder->expects($this->any())
+            ->method('setTemplateIdentifier')
+            ->with($templateIdentifier)
+            ->willReturnSelf();
+        $this->transportBuilder->expects($this->any())
+            ->method('setTemplateOptions')
+            ->with(['area' => Area::AREA_FRONTEND, 'store' => $storeId])
+            ->willReturnSelf();
+        $this->transportBuilder->expects($this->any())
+            ->method('setTemplateVars')
+            ->with(['customer' => $this->customerSecure, 'store' => $this->store])
+            ->willReturnSelf();
+        $this->transportBuilder->expects($this->any())
+            ->method('setFrom')
+            ->with($sender)
+            ->willReturnSelf();
+        $this->transportBuilder->expects($this->any())
+            ->method('addTo')
+            ->with($email, $customerName)
+            ->willReturnSelf();
+        $this->transportBuilder->expects($this->any())
+            ->method('getTransport')
+            ->willReturn($transport);
+
+        $transport->expects($this->any())
+            ->method('sendMessage');
+    }
+
+    public function testInitiatePasswordResetEmailReminder()
+    {
+        $customerId = 1;
+
+        $email = 'test@example.com';
+        $template = AccountManagement::EMAIL_REMINDER;
+        $templateIdentifier = 'Template Identifier';
+        $sender = 'Sender';
+
+        $storeId = 1;
+        $isFrontendSecure = true;
+
+        $resetUrl = 'reset url';
+
+        mt_srand(mt_rand() + (100000000 * microtime()) % PHP_INT_MAX);
+        $hash = md5(uniqid(microtime() . mt_rand(0, mt_getrandmax()), true));
+
+        $this->store->expects($this->once())
+            ->method('isFrontUrlSecure')
+            ->willReturn($isFrontendSecure);
+
+        $this->url->expects($this->once())
+            ->method('setScope')
+            ->with($storeId)
+            ->willReturnSelf();
+        $this->url->expects($this->once())
+            ->method('getUrl')
+            ->with(
+                'customer/account/createPassword',
+                [
+                    '_query' => ['id' => $customerId, 'token' => $hash],
+                    '_store' => $storeId,
+                    '_secure' => $isFrontendSecure,
+                ]
+            )
+            ->willReturn($resetUrl);
+
+        $this->scopeConfig->expects($this->at(0))
+            ->method('getValue')
+            ->with(AccountManagement::XML_PATH_REMIND_EMAIL_TEMPLATE, ScopeInterface::SCOPE_STORE, $storeId)
+            ->willReturn($templateIdentifier);
+        $this->scopeConfig->expects($this->at(1))
+            ->method('getValue')
+            ->with(AccountManagement::XML_PATH_FORGOT_EMAIL_IDENTITY, ScopeInterface::SCOPE_STORE, $storeId)
+            ->willReturn($sender);
+
+        $this->customerSecure->expects($this->any())
+            ->method('setResetPasswordUrl')
+            ->with($resetUrl)
+            ->willReturnSelf();
+
+        $this->prepareInitiatePasswordReset($email, $templateIdentifier, $sender, $storeId, $customerId, $hash);
+
+        $this->assertTrue($this->accountManagement->initiatePasswordReset($email, $template));
+    }
+
+    public function testInitiatePasswordResetEmailReset()
+    {
+        $storeId = 1;
+        $customerId = 1;
+
+        $email = 'test@example.com';
+        $template = AccountManagement::EMAIL_RESET;
+        $templateIdentifier = 'Template Identifier';
+        $sender = 'Sender';
+
+        mt_srand(mt_rand() + (100000000 * microtime()) % PHP_INT_MAX);
+        $hash = md5(uniqid(microtime() . mt_rand(0, mt_getrandmax()), true));
+
+        $this->scopeConfig->expects($this->at(0))
+            ->method('getValue')
+            ->with(AccountManagement::XML_PATH_FORGOT_EMAIL_TEMPLATE, ScopeInterface::SCOPE_STORE, $storeId)
+            ->willReturn($templateIdentifier);
+        $this->scopeConfig->expects($this->at(1))
+            ->method('getValue')
+            ->with(AccountManagement::XML_PATH_FORGOT_EMAIL_IDENTITY, ScopeInterface::SCOPE_STORE, $storeId)
+            ->willReturn($sender);
+
+        $this->prepareInitiatePasswordReset($email, $templateIdentifier, $sender, $storeId, $customerId, $hash);
+
+        $this->assertTrue($this->accountManagement->initiatePasswordReset($email, $template));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage Invalid value of "" provided for the email type field
+     */
+    public function testInitiatePasswordResetNoTemplate()
+    {
+        $storeId = 1;
+        $customerId = 1;
+
+        $email = 'test@example.com';
+        $template = null;
+        $templateIdentifier = 'Template Identifier';
+        $sender = 'Sender';
+
+        mt_srand(mt_rand() + (100000000 * microtime()) % PHP_INT_MAX);
+        $hash = md5(uniqid(microtime() . mt_rand(0, mt_getrandmax()), true));
+
+        $this->prepareInitiatePasswordReset($email, $templateIdentifier, $sender, $storeId, $customerId, $hash);
+
+        $this->accountManagement->initiatePasswordReset($email, $template);
+    }
 }

From 2b10f3733ef7eb889c3fd5524fd7a2e32a12c8fc Mon Sep 17 00:00:00 2001
From: Sergey Semenov <ssemenov@ebay.com>
Date: Wed, 1 Apr 2015 19:40:04 +0300
Subject: [PATCH 02/17] MAGETWO-35321: Unexpected response for API
 "/V1/customers/password" service

---
 .../Test/Unit/Model/AccountManagementTest.php        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
index cff52aad64591..f9bcde90bd9ca 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
@@ -402,6 +402,18 @@ protected function prepareInitiatePasswordReset($email, $templateIdentifier, $se
             ->with($customer, '\Magento\Customer\Api\Data\CustomerInterface')
             ->willReturn($customerData);
 
+        $this->prepareEmailSend($email, $templateIdentifier, $sender, $storeId, $customerName);
+    }
+
+    /**
+     * @param $email
+     * @param $templateIdentifier
+     * @param $sender
+     * @param $storeId
+     * @param $customerName
+     */
+    protected function prepareEmailSend($email, $templateIdentifier, $sender, $storeId, $customerName)
+    {
         $transport = $this->getMockBuilder('Magento\Framework\Mail\TransportInterface')
             ->getMock();
 

From 08a75f8986fbd08c3c91afcbc0498a27d025af68 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@ebay.com>
Date: Thu, 2 Apr 2015 17:01:01 +0300
Subject: [PATCH 03/17] =?UTF-8?q?MAGETWO-35025:=20Can=E2=80=99t=20include?=
 =?UTF-8?q?=20a=20third-party=20link=20to=20frontend=20<head>=20section=20?=
 =?UTF-8?q?via=20layout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Framework/View/Layout/etc/head.xsd        |  2 +
 .../View/Page/Config/Generator/Head.php       |  3 +-
 .../View/Page/Config/Reader/Head.php          | 19 +++++
 .../Unit/Page/Config/Generator/HeadTest.php   | 12 ++-
 .../Test/Unit/Page/Config/Reader/HeadTest.php | 77 +++++++++++++++++++
 .../Unit/Page/Config/_files/template_head.xml |  1 +
 6 files changed, 109 insertions(+), 5 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Reader/HeadTest.php

diff --git a/lib/internal/Magento/Framework/View/Layout/etc/head.xsd b/lib/internal/Magento/Framework/View/Layout/etc/head.xsd
index a9d5c3de75de8..5cf230fd0c751 100644
--- a/lib/internal/Magento/Framework/View/Layout/etc/head.xsd
+++ b/lib/internal/Magento/Framework/View/Layout/etc/head.xsd
@@ -18,6 +18,7 @@
         <xs:attribute name="sizes" type="xs:string"/>
         <xs:attribute name="target" type="xs:string"/>
         <xs:attribute name="type" type="xs:string"/>
+        <xs:attribute name="src_type" type="xs:string"/>
     </xs:complexType>
 
     <xs:complexType name="metaType">
@@ -35,6 +36,7 @@
         <xs:attribute name="async" type="xs:string"/>
         <xs:attribute name="charset" type="xs:string"/>
         <xs:attribute name="type" type="xs:string"/>
+        <xs:attribute name="src_type" type="xs:string"/>
     </xs:complexType>
 
     <xs:complexType name="headAttributeType">
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php b/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php
index 8d7862fa94da0..153141cbbe2e2 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php
@@ -49,6 +49,7 @@ class Head implements Layout\GeneratorInterface
     protected $serviceAssetProperties = [
         'src',
         'src_type',
+        'content_type',
     ];
 
     /**
@@ -108,7 +109,7 @@ protected function processAssets(Structure $pageStructure)
             if (isset($data['src_type']) && in_array($data['src_type'], $this->remoteAssetTypes)) {
                 $this->pageConfig->addRemotePageAsset(
                     $name,
-                    self::VIRTUAL_CONTENT_TYPE_LINK,
+                    isset($data['content_type']) ? $data['content_type'] : self::VIRTUAL_CONTENT_TYPE_LINK,
                     $this->getAssetProperties($data)
                 );
             } else {
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php b/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
index cdb7cecdb382b..253e89389564f 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
@@ -41,6 +41,24 @@ public function getSupportedNodes()
         return [self::TYPE_HEAD];
     }
 
+    /**
+     * Add asset content type to node by name
+     *
+     * @param Layout\Element $node
+     * @return void
+     */
+    protected function addContentTypeByNodeName(Layout\Element $node)
+    {
+        switch ($node->getName()) {
+            case self::HEAD_CSS:
+                $node->addAttribute('content_type', 'css');
+                break;
+            case self::HEAD_SCRIPT:
+                $node->addAttribute('content_type', 'js');
+                break;
+        }
+    }
+
     /**
      * {@inheritdoc}
      *
@@ -59,6 +77,7 @@ public function interpret(
                 case self::HEAD_CSS:
                 case self::HEAD_SCRIPT:
                 case self::HEAD_LINK:
+                    $this->addContentTypeByNodeName($node);
                     $pageConfigStructure->addAssets($node->getAttribute('src'), $this->getAttributes($node));
                     break;
 
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php
index 5cc6076950b66..6efe3ebaace42 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php
@@ -70,12 +70,16 @@ public function testProcess()
         $structureMock->expects($this->once())->method('processRemoveElementAttributes');
 
         $assets = [
-            'remoteName' => ['src' => 'file-url', 'src_type' => 'url', 'media' => "all"],
-            'name' => ['src' => 'file-path', 'ie_condition' => 'lt IE 7', 'media' => "print"],
+            'remoteCss' => ['src' => 'file-url', 'src_type' => 'url', 'media' => "all", 'content_type' => 'css'],
+            'remoteLink' => ['src' => 'file-url', 'src_type' => 'url', 'media' => "all"],
+            'name' => ['src' => 'file-path', 'ie_condition' => 'lt IE 7', 'media' => "print", 'content_type' => 'css'],
         ];
-        $this->pageConfigMock->expects($this->once())
+        $this->pageConfigMock->expects($this->at(0))
+            ->method('addRemotePageAsset')
+            ->with('remoteCss', 'css', ['attributes' => ['media' => 'all']]);
+        $this->pageConfigMock->expects($this->at(1))
             ->method('addRemotePageAsset')
-            ->with('remoteName', Head::VIRTUAL_CONTENT_TYPE_LINK, ['attributes' => ['media' => 'all']]);
+            ->with('remoteLink', Head::VIRTUAL_CONTENT_TYPE_LINK, ['attributes' => ['media' => 'all']]);
         $this->pageConfigMock->expects($this->once())
             ->method('addPageAsset')
             ->with('name', ['attributes' => ['media' => 'print'], 'ie_condition' => 'lt IE 7']);
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Reader/HeadTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Reader/HeadTest.php
new file mode 100644
index 0000000000000..fc0df0799f544
--- /dev/null
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Reader/HeadTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\View\Test\Unit\Page\Config\Reader;
+
+use Magento\Framework\View\Layout\Element;
+use Magento\Framework\View\Page\Config;
+use Magento\Framework\View\Page\Config\Reader\Head;
+
+class HeadTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Head
+     */
+    protected $model;
+
+    protected function setUp()
+    {
+        $this->model = new Head();
+    }
+
+    public function testInterpret()
+    {
+        $readerContextMock = $this->getMockBuilder('Magento\Framework\View\Layout\Reader\Context')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $structureMock = $this->getMockBuilder('Magento\Framework\View\Page\Config\Structure')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $readerContextMock->expects($this->once())
+            ->method('getPageConfigStructure')
+            ->willReturn($structureMock);
+
+        $xml = file_get_contents(__DIR__ . '/../_files/template_head.xml');
+        $element = new Element($xml);
+
+        $structureMock->expects($this->at(0))
+            ->method('setTitle')
+            ->with('Test title')
+            ->willReturnSelf();
+
+        $structureMock->expects($this->at(1))
+            ->method('setMetaData')
+            ->with('meta_name', 'meta_content')
+            ->willReturnSelf();
+
+        $structureMock->expects($this->at(2))
+            ->method('addAssets')
+            ->with('path/file.css', ['src' => 'path/file.css', 'media' => 'all', 'content_type' => 'css'])
+            ->willReturnSelf();
+
+        $structureMock->expects($this->at(3))
+            ->method('addAssets')
+            ->with('path/file.js', ['src' => 'path/file.js', 'defer' => 'defer', 'content_type' => 'js'])
+            ->willReturnSelf();
+
+        $structureMock->expects($this->at(4))
+            ->method('addAssets')
+            ->with('http://url.com', ['src' => 'http://url.com', 'src_type' => 'url'])
+            ->willReturnSelf();
+
+        $structureMock->expects($this->at(5))
+            ->method('removeAssets')
+            ->with('path/remove/file.css')
+            ->willReturnSelf();
+
+        $structureMock->expects($this->at(6))
+            ->method('setElementAttribute')
+            ->with(Config::ELEMENT_TYPE_HEAD, 'head_attribute_name', 'head_attribute_value')
+            ->willReturnSelf();
+
+        $this->assertEquals($this->model, $this->model->interpret($readerContextMock, $element->children()[0]));
+    }
+}
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/_files/template_head.xml b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/_files/template_head.xml
index 1e9db0ed75e38..15873b46e98e0 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/_files/template_head.xml
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/_files/template_head.xml
@@ -11,6 +11,7 @@
         <meta name="meta_name" content="meta_content"/>
         <css src="path/file.css" media="all" />
         <script src="path/file.js" defer="defer"/>
+        <link src="http://url.com" src_type="url"/>
         <remove src="path/remove/file.css"/>
         <attribute name="head_attribute_name" value="head_attribute_value"/>
     </head>

From 4987925b3d7f3e2572e705e44ee565cc8d73d599 Mon Sep 17 00:00:00 2001
From: Andriy Nasinnyk <anasinnyk@ebay.com>
Date: Thu, 2 Apr 2015 21:10:32 +0300
Subject: [PATCH 04/17] MAGETWO-35656:
 \Magento\Framework\Stdlib\DateTime\DateTime methods malformed

---
 .../Framework/Stdlib/DateTime/DateTime.php    |  2 +-
 .../Test/Unit/DateTime/DateTimeTest.php       | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeTest.php

diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php
index dc36a0755122e..f3350811d2e39 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php
@@ -114,7 +114,7 @@ public function gmtTimestamp($input = null)
             return false;
         }
         $date = $this->_localeDate->date($result);
-        $timestamp = $date->getTimestamp() - $date->getTimezone()->getOffset($date);
+        $timestamp = $date->getTimestamp();
         unset($date);
         return $timestamp;
     }
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeTest.php
new file mode 100644
index 0000000000000..e54820d64f487
--- /dev/null
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeTest.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Stdlib\Test\Unit\DateTime;
+
+use \Magento\Framework\Stdlib\DateTime\DateTime;
+
+/**
+ * Magento\Framework\Stdlib\DateTimeTest test case
+ */
+class DateTimeTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @test
+     */
+    public function testGmtTimestamp()
+    {
+        $timezone = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\TimezoneInterface')->getMock();
+        $timezone->expects($this->any())
+            ->method('date')
+            ->willReturn(new \DateTime('2015-04-02 21:03:00'));
+        /** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone */
+
+        $dateTime = new DateTime($timezone);
+        $this->assertEquals(
+            gmdate('U', strtotime('2015-04-02 21:03:00')),
+            $dateTime->gmtTimestamp('2015-04-02 21:03:00')
+        );
+    }
+}

From b99366e65e62008819a99ff253d758224724bc73 Mon Sep 17 00:00:00 2001
From: Andriy Nasinnyk <anasinnyk@ebay.com>
Date: Fri, 3 Apr 2015 13:40:45 +0300
Subject: [PATCH 05/17] MAGETWO-35795: Expose CMS api's as web API

---
 app/code/Magento/Cms/Api/BlockRepositoryInterface.php         | 1 +
 app/code/Magento/Cms/Api/Data/BlockInterface.php              | 1 +
 app/code/Magento/Cms/Api/Data/BlockSearchResultsInterface.php | 1 +
 app/code/Magento/Cms/Api/Data/PageInterface.php               | 1 +
 app/code/Magento/Cms/Api/Data/PageSearchResultsInterface.php  | 1 +
 app/code/Magento/Cms/Api/PageRepositoryInterface.php          | 1 +
 6 files changed, 6 insertions(+)

diff --git a/app/code/Magento/Cms/Api/BlockRepositoryInterface.php b/app/code/Magento/Cms/Api/BlockRepositoryInterface.php
index e9834b821a66b..02b45d199fe59 100644
--- a/app/code/Magento/Cms/Api/BlockRepositoryInterface.php
+++ b/app/code/Magento/Cms/Api/BlockRepositoryInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * CMS block CRUD interface.
+ * @api
  */
 interface BlockRepositoryInterface
 {
diff --git a/app/code/Magento/Cms/Api/Data/BlockInterface.php b/app/code/Magento/Cms/Api/Data/BlockInterface.php
index d26f46cda2fb2..a6602de2fd2c1 100644
--- a/app/code/Magento/Cms/Api/Data/BlockInterface.php
+++ b/app/code/Magento/Cms/Api/Data/BlockInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * CMS block interface.
+ * @api
  */
 interface BlockInterface
 {
diff --git a/app/code/Magento/Cms/Api/Data/BlockSearchResultsInterface.php b/app/code/Magento/Cms/Api/Data/BlockSearchResultsInterface.php
index 715790c173436..682910c4cdcab 100644
--- a/app/code/Magento/Cms/Api/Data/BlockSearchResultsInterface.php
+++ b/app/code/Magento/Cms/Api/Data/BlockSearchResultsInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * Interface for cms block search results.
+ * @api
  */
 interface BlockSearchResultsInterface extends SearchResultsInterface
 {
diff --git a/app/code/Magento/Cms/Api/Data/PageInterface.php b/app/code/Magento/Cms/Api/Data/PageInterface.php
index 8e03d0ed1ffde..03e292c4c258a 100644
--- a/app/code/Magento/Cms/Api/Data/PageInterface.php
+++ b/app/code/Magento/Cms/Api/Data/PageInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * CMS page interface.
+ * @api
  */
 interface PageInterface
 {
diff --git a/app/code/Magento/Cms/Api/Data/PageSearchResultsInterface.php b/app/code/Magento/Cms/Api/Data/PageSearchResultsInterface.php
index 160d93d172c21..58141ae9bf5df 100644
--- a/app/code/Magento/Cms/Api/Data/PageSearchResultsInterface.php
+++ b/app/code/Magento/Cms/Api/Data/PageSearchResultsInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * Interface for cms page search results.
+ * @api
  */
 interface PageSearchResultsInterface extends SearchResultsInterface
 {
diff --git a/app/code/Magento/Cms/Api/PageRepositoryInterface.php b/app/code/Magento/Cms/Api/PageRepositoryInterface.php
index 9dcf95d572fd5..b65ce6a83f925 100644
--- a/app/code/Magento/Cms/Api/PageRepositoryInterface.php
+++ b/app/code/Magento/Cms/Api/PageRepositoryInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * CMS page CRUD interface.
+ * @api
  */
 interface PageRepositoryInterface
 {

From 1fe635a8177f7136a5e18c28bc6cbb83942c5b3b Mon Sep 17 00:00:00 2001
From: Andriy Nasinnyk <anasinnyk@ebay.com>
Date: Fri, 3 Apr 2015 15:32:29 +0300
Subject: [PATCH 06/17] MAGETWO-35656:
 \Magento\Framework\Stdlib\DateTime\DateTime methods malformed

---
 lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php
index f3350811d2e39..a9d10c39abea5 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php
@@ -136,7 +136,7 @@ public function timestamp($input = null)
             $result = strtotime($input);
         }
         $date = $this->_localeDate->date($result);
-        $timestamp = $date->getTimestamp() + $date->getTimezone()->getOffset($date);
+        $timestamp = $date->getTimestamp();
         unset($date);
         return $timestamp;
     }

From 4350854caf50d94972d0bfbdf1b625f70f78e30f Mon Sep 17 00:00:00 2001
From: Sergey Semenov <ssemenov@ebay.com>
Date: Fri, 3 Apr 2015 18:46:05 +0300
Subject: [PATCH 07/17] MAGETWO-35273: Specified details for Grouped product
 are lost after adding to wishlist

---
 .../Pricing/Price/ConfiguredPrice.php         |  80 +++++++
 .../Pricing/Price/ConfiguredPriceTest.php     | 200 ++++++++++++++++++
 app/code/Magento/GroupedProduct/etc/di.xml    |   1 +
 3 files changed, 281 insertions(+)
 create mode 100644 app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredPrice.php
 create mode 100644 app/code/Magento/GroupedProduct/Test/Unit/Pricing/Price/ConfiguredPriceTest.php

diff --git a/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredPrice.php b/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredPrice.php
new file mode 100644
index 0000000000000..d67af137aa776
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredPrice.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\GroupedProduct\Pricing\Price;
+
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\Catalog\Pricing\Price\ConfiguredPriceInterface;
+use Magento\Catalog\Pricing\Price\FinalPrice as CatalogFinalPrice;
+
+class ConfiguredPrice extends CatalogFinalPrice implements ConfiguredPriceInterface
+{
+    /**
+     * Price type configured
+     */
+    const PRICE_CODE = self::CONFIGURED_PRICE_CODE;
+
+    /**
+     * @var null|ItemInterface
+     */
+    protected $item;
+
+    /**
+     * @var float
+     */
+    protected $configuredPrice;
+
+    /**
+     * @param ItemInterface $item
+     * @return $this
+     */
+    public function setItem(ItemInterface $item)
+    {
+        $this->item = $item;
+        return $this;
+    }
+
+    /**
+     * Calculate configured price
+     *
+     * @return float
+     */
+    protected function calculatePrice()
+    {
+        if (!$this->configuredPrice) {
+            /** @var \Magento\GroupedProduct\Model\Product\Type\Grouped $typeInstance */
+            $typeInstance = $this->getProduct()->getTypeInstance();
+            $associatedProducts = $typeInstance
+                ->setStoreFilter($this->getProduct()->getStore(), $this->getProduct())
+                ->getAssociatedProducts($this->getProduct());
+
+            foreach ($associatedProducts as $product) {
+                /** @var \Magento\Catalog\Model\Product $product */
+                /** @var \Magento\Wishlist\Model\Item\Option $customOption */
+                $customOption = $this->getProduct()
+                    ->getCustomOption('associated_product_' . $product->getId());
+                if (!$customOption) {
+                    continue;
+                }
+                $finalPrice = $product->getPriceInfo()
+                    ->getPrice(FinalPrice::PRICE_CODE)
+                    ->getValue();
+                $this->configuredPrice += $finalPrice * ($customOption->getValue() ? $customOption->getValue() : 1);
+            }
+        }
+        return $this->configuredPrice;
+    }
+
+    /**
+     * Price value of product with configured options
+     *
+     * @return bool|float
+     */
+    public function getValue()
+    {
+        return $this->item ? $this->calculatePrice() : parent::getValue();
+    }
+}
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Pricing/Price/ConfiguredPriceTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Pricing/Price/ConfiguredPriceTest.php
new file mode 100644
index 0000000000000..dd4a6339dc60f
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Pricing/Price/ConfiguredPriceTest.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\GroupedProduct\Test\Unit\Pricing\Price;
+
+use Magento\Catalog\Pricing\Price\BasePrice;
+use Magento\GroupedProduct\Pricing\Price\ConfiguredPrice;
+use Magento\GroupedProduct\Pricing\Price\FinalPrice;
+
+class ConfiguredPriceTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ConfiguredPrice
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\Framework\Pricing\Object\SaleableInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $saleableItem;
+
+    /**
+     * @var \Magento\Framework\Pricing\Adjustment\CalculatorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $calculator;
+
+    /**
+     * @var \Magento\Framework\Pricing\PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $priceCurrency;
+
+    /**
+     * @var \Magento\Framework\Pricing\Price\PriceInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $price;
+
+    /**
+     * @var \Magento\Framework\Pricing\PriceInfoInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $priceInfo;
+
+
+    public function setUp()
+    {
+        $this->price = $this->getMockBuilder('Magento\Framework\Pricing\Price\PriceInterface')
+            ->getMock();
+
+        $this->priceInfo = $this->getMockBuilder('Magento\Framework\Pricing\PriceInfoInterface')
+            ->getMock();
+
+        $this->saleableItem = $this->getMockBuilder('Magento\Framework\Pricing\Object\SaleableInterface')
+            ->setMethods([
+                'getTypeId',
+                'getId',
+                'getQty',
+                'getPriceInfo',
+                'getTypeInstance',
+                'getStore',
+                'getCustomOption',
+            ])
+            ->getMock();
+        $this->saleableItem->expects($this->once())
+            ->method('getPriceInfo')
+            ->willReturn($this->priceInfo);
+
+        $this->calculator = $this->getMockBuilder('Magento\Framework\Pricing\Adjustment\CalculatorInterface')
+            ->getMock();
+
+        $this->priceCurrency = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')
+            ->getMock();
+
+        $this->model = new ConfiguredPrice(
+            $this->saleableItem,
+            null,
+            $this->calculator,
+            $this->priceCurrency
+        );
+    }
+
+    public function testSetItem()
+    {
+        $item = $this->getMockBuilder('Magento\Catalog\Model\Product\Configuration\Item\ItemInterface')
+            ->getMock();
+
+        $this->model->setItem($item);
+    }
+
+    public function testGetValueNoItem()
+    {
+        $resultPrice = rand(1, 9);
+
+        $this->price->expects($this->once())
+            ->method('getValue')
+            ->willReturn($resultPrice);
+
+        $this->priceInfo->expects($this->once())
+            ->method('getPrice')
+            ->with(BasePrice::PRICE_CODE)
+            ->willReturn($this->price);
+
+        $this->assertEquals($resultPrice, $this->model->getValue());
+    }
+
+    public function testGetValue()
+    {
+        $resultPrice = rand(1, 9);
+        $customOptionOneQty = rand(1, 9);
+        $customOptionTwoQty = rand(1, 9);
+
+        $priceInfoBase = $this->getMockBuilder('Magento\Framework\Pricing\PriceInfo\Base')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $priceInfoBase->expects($this->any())
+            ->method('getPrice')
+            ->with(FinalPrice::PRICE_CODE)
+            ->willReturn($this->price);
+
+        $productOne = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productOne->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+        $productOne->expects($this->once())
+            ->method('getPriceInfo')
+            ->willReturn($priceInfoBase);
+
+        $productTwo = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productTwo->expects($this->once())
+            ->method('getId')
+            ->willReturn(2);
+        $productTwo->expects($this->once())
+            ->method('getPriceInfo')
+            ->willReturn($priceInfoBase);
+
+        $this->price->expects($this->any())
+            ->method('getValue')
+            ->willReturn($resultPrice);
+
+        $customOptionOne = $this->getMockBuilder('Magento\Wishlist\Model\Item\Option')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $customOptionOne->expects($this->any())
+            ->method('getValue')
+            ->willReturn($customOptionOneQty);
+
+        $customOptionTwo = $this->getMockBuilder('Magento\Wishlist\Model\Item\Option')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $customOptionTwo->expects($this->any())
+            ->method('getValue')
+            ->willReturn($customOptionTwoQty);
+
+        $store = $this->getMockBuilder('Magento\Store\Model\Store')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $groupedProduct = $this->getMockBuilder('Magento\GroupedProduct\Model\Product\Type\Grouped')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $groupedProduct->expects($this->once())
+            ->method('setStoreFilter')
+            ->with($store, $this->saleableItem)
+            ->willReturnSelf();
+        $groupedProduct->expects($this->once())
+            ->method('getAssociatedProducts')
+            ->with($this->saleableItem)
+            ->willReturn([$productOne, $productTwo]);
+
+        $this->saleableItem->expects($this->once())
+            ->method('getTypeInstance')
+            ->willReturn($groupedProduct);
+        $this->saleableItem->expects($this->any())
+            ->method('getStore')
+            ->willReturn($store);
+        $this->saleableItem->expects($this->any())
+            ->method('getCustomOption')
+            ->willReturnMap([
+                ['associated_product_' . 1, $customOptionOne],
+                ['associated_product_' . 2, $customOptionTwo],
+            ]);
+
+        $item = $this->getMockBuilder('Magento\Catalog\Model\Product\Configuration\Item\ItemInterface')
+            ->getMock();
+
+        $this->model->setItem($item);
+
+        $result = 0;
+        foreach ([$customOptionOneQty, $customOptionTwoQty] as $qty) {
+            $result += $resultPrice * $qty;
+        }
+
+        $this->assertEquals($result, $this->model->getValue());
+    }
+}
diff --git a/app/code/Magento/GroupedProduct/etc/di.xml b/app/code/Magento/GroupedProduct/etc/di.xml
index 638f2ef823288..d6bd0d0fe4793 100644
--- a/app/code/Magento/GroupedProduct/etc/di.xml
+++ b/app/code/Magento/GroupedProduct/etc/di.xml
@@ -47,6 +47,7 @@
         <arguments>
             <argument name="prices" xsi:type="array">
                 <item name="final_price" xsi:type="string">Magento\GroupedProduct\Pricing\Price\FinalPrice</item>
+                <item name="configured_price" xsi:type="string">Magento\GroupedProduct\Pricing\Price\ConfiguredPrice</item>
             </argument>
             <argument name="target" xsi:type="object">Magento\Catalog\Pricing\Price\Pool</argument>
         </arguments>

From 31311366cb82a4a47c5c755951bff9d6a4b67074 Mon Sep 17 00:00:00 2001
From: okarpenko <okarpenko@ebay.com>
Date: Mon, 6 Apr 2015 17:27:21 +0300
Subject: [PATCH 08/17] MAGETWO-31868: Impossible to configure products in
 customer wishlist on backend

---
 .../view/adminhtml/web/catalog/product/composite/configure.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
index c61adcd6d9609..d2e22b3fb93e7 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
@@ -195,7 +195,7 @@ ProductConfigure.prototype = {
             return false;
         }
 
-        this._initWindowElements();
+        this.initialize();
         this.current.listType = listType;
         this.current.itemId = itemId;
         this.confirmedCurrentId = this._getConfirmedBlockId(listType, itemId);

From 93c2cd6df6b8e2e9aec61bee1279a4a047e32fbd Mon Sep 17 00:00:00 2001
From: Sergey Semenov <ssemenov@ebay.com>
Date: Mon, 6 Apr 2015 17:36:57 +0300
Subject: [PATCH 09/17] MAGETWO-35273: Specified details for Grouped product
 are lost after adding to wishlist

---
 .../Pricing/Price/ConfiguredPrice.php         | 56 +++++++++++--------
 .../Pricing/Price/ConfiguredPriceTest.php     | 21 +++++++
 .../view/frontend/templates/sidebar.phtml     |  7 +--
 3 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredPrice.php b/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredPrice.php
index d67af137aa776..8f5aad5d58990 100644
--- a/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredPrice.php
+++ b/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredPrice.php
@@ -6,9 +6,11 @@
 
 namespace Magento\GroupedProduct\Pricing\Price;
 
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
 use Magento\Catalog\Pricing\Price\ConfiguredPriceInterface;
 use Magento\Catalog\Pricing\Price\FinalPrice as CatalogFinalPrice;
+use Magento\Framework\Pricing\Amount\AmountInterface;
 
 class ConfiguredPrice extends CatalogFinalPrice implements ConfiguredPriceInterface
 {
@@ -22,11 +24,6 @@ class ConfiguredPrice extends CatalogFinalPrice implements ConfiguredPriceInterf
      */
     protected $item;
 
-    /**
-     * @var float
-     */
-    protected $configuredPrice;
-
     /**
      * @param ItemInterface $item
      * @return $this
@@ -37,6 +34,18 @@ public function setItem(ItemInterface $item)
         return $this;
     }
 
+    /**
+     * Get Price Amount object
+     *
+     * @return AmountInterface
+     */
+    public function getAmount()
+    {
+        // Reset amount
+        $this->amount = null;
+        return parent::getAmount();
+    }
+
     /**
      * Calculate configured price
      *
@@ -44,28 +53,27 @@ public function setItem(ItemInterface $item)
      */
     protected function calculatePrice()
     {
-        if (!$this->configuredPrice) {
-            /** @var \Magento\GroupedProduct\Model\Product\Type\Grouped $typeInstance */
-            $typeInstance = $this->getProduct()->getTypeInstance();
-            $associatedProducts = $typeInstance
-                ->setStoreFilter($this->getProduct()->getStore(), $this->getProduct())
-                ->getAssociatedProducts($this->getProduct());
+        $value = 0.;
+        /** @var \Magento\GroupedProduct\Model\Product\Type\Grouped $typeInstance */
+        $typeInstance = $this->getProduct()->getTypeInstance();
+        $associatedProducts = $typeInstance
+            ->setStoreFilter($this->getProduct()->getStore(), $this->getProduct())
+            ->getAssociatedProducts($this->getProduct());
 
-            foreach ($associatedProducts as $product) {
-                /** @var \Magento\Catalog\Model\Product $product */
-                /** @var \Magento\Wishlist\Model\Item\Option $customOption */
-                $customOption = $this->getProduct()
-                    ->getCustomOption('associated_product_' . $product->getId());
-                if (!$customOption) {
-                    continue;
-                }
-                $finalPrice = $product->getPriceInfo()
-                    ->getPrice(FinalPrice::PRICE_CODE)
-                    ->getValue();
-                $this->configuredPrice += $finalPrice * ($customOption->getValue() ? $customOption->getValue() : 1);
+        foreach ($associatedProducts as $product) {
+            /** @var Product $product */
+            /** @var \Magento\Wishlist\Model\Item\Option $customOption */
+            $customOption = $this->getProduct()
+                ->getCustomOption('associated_product_' . $product->getId());
+            if (!$customOption) {
+                continue;
             }
+            $finalPrice = $product->getPriceInfo()
+                ->getPrice(FinalPrice::PRICE_CODE)
+                ->getValue();
+            $value += $finalPrice * ($customOption->getValue() ? $customOption->getValue() : 1);
         }
-        return $this->configuredPrice;
+        return $value;
     }
 
     /**
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Pricing/Price/ConfiguredPriceTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Pricing/Price/ConfiguredPriceTest.php
index dd4a6339dc60f..4ff8ed45cadeb 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Pricing/Price/ConfiguredPriceTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Pricing/Price/ConfiguredPriceTest.php
@@ -197,4 +197,25 @@ public function testGetValue()
 
         $this->assertEquals($result, $this->model->getValue());
     }
+
+    public function testGetAmount()
+    {
+        $resultPrice = rand(1, 9);
+
+        $this->price->expects($this->once())
+            ->method('getValue')
+            ->willReturn($resultPrice);
+
+        $this->priceInfo->expects($this->once())
+            ->method('getPrice')
+            ->with(BasePrice::PRICE_CODE)
+            ->willReturn($this->price);
+
+        $this->calculator->expects($this->once())
+            ->method('getAmount')
+            ->with($resultPrice, $this->saleableItem)
+            ->willReturn($resultPrice);
+
+        $this->assertEquals($resultPrice, $this->model->getAmount());
+    }
 }
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
index 63de14360bbe4..5382f3d1a1beb 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
@@ -40,11 +40,10 @@ $wishlistHelper = $this->helper('Magento\Wishlist\Helper\Data');
                                        class="product-item-link"><?php echo $block->escapeHtml($product->getName()) ?></a>
                                 </strong>
                                 <?php
-                                    echo $block->getProductPriceHtml(
-                                        $product,
+                                    echo $block->getItemPriceHtml(
+                                        $item,
                                         \Magento\Catalog\Pricing\Price\ConfiguredPriceInterface::CONFIGURED_PRICE_CODE,
-                                        \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-                                        ['item' => $item]
+                                        \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST
                                     );
                                 ?>
                                 <div class="product-item-actions">

From 30fc6a4836f62d8de55cf211047d2930d12c00ea Mon Sep 17 00:00:00 2001
From: vsevostianov <vsevostianov@ebay.com>
Date: Mon, 6 Apr 2015 18:30:26 +0300
Subject: [PATCH 10/17] MAGETWO-35273: Specified details for Grouped product
 are lost after adding to wishlist

- Functional test fixes
---
 .../Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php | 2 +-
 .../ConfigureProductInCustomerWishlistOnBackendTest.php         | 1 -
 .../ConfigureProductInCustomerWishlistOnFrontendTest.xml        | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php
index 405852f2ee186..4a0a05e47071d 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php
@@ -33,7 +33,7 @@ public function processAssert(
         FixtureFactory $fixtureFactory
     ) {
         $cmsIndex->getLinksBlock()->openLink('My Wish List');
-        $this->assertProductDetails($wishlistIndex, $fixtureFactory, $product);
+        $this->assertProductDetails($wishlistIndex, $product, $fixtureFactory);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.php
index 233640f3eb490..b358e5c134402 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.php
@@ -44,7 +44,6 @@ class ConfigureProductInCustomerWishlistOnBackendTest extends AbstractWishlistTe
      */
     public function __prepare(Customer $customer)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-31868');
         $customer->persist();
 
         return ['customer' => $customer];
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml
index c1ff8db58e314..835509955c51d 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml
@@ -18,13 +18,11 @@
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
         </variation>
         <variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation3">
-            <data name="issue" xsi:type="string">Bug: MAGETWO-33952</data>
             <data name="product" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
         </variation>
         <variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation4">
-            <data name="issue" xsi:type="string">Bug: MAGETWO-33952</data>
             <data name="product" xsi:type="string">downloadableProduct::with_two_separately_links</data>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />

From 92898c9ac488ce0d4fafd2cfe3e956ad3685fe11 Mon Sep 17 00:00:00 2001
From: okarpenko <okarpenko@ebay.com>
Date: Tue, 7 Apr 2015 14:57:58 +0300
Subject: [PATCH 11/17] MAGETWO-35890: Error if add product from wishlist to
 cart and second store view exists

---
 app/code/Magento/Store/Model/StorageFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Store/Model/StorageFactory.php b/app/code/Magento/Store/Model/StorageFactory.php
index bce9da866b684..2d63f42380231 100644
--- a/app/code/Magento/Store/Model/StorageFactory.php
+++ b/app/code/Magento/Store/Model/StorageFactory.php
@@ -262,7 +262,7 @@ protected function _checkRequestStore(\Magento\Store\Model\StoreManagerInterface
     protected function getActiveStoreByCode(\Magento\Store\Model\StoreManagerInterface $storage, $scopeCode)
     {
         $stores = $storage->getStores(true, true);
-        if ($scopeCode && isset($stores[$scopeCode])
+        if (is_string($scopeCode) && isset($stores[$scopeCode])
             && $stores[$scopeCode]->getId()
             && $stores[$scopeCode]->getIsActive()
         ) {

From f0f723c01a4c230b1bf5cad6ac12b1dadd2ed451 Mon Sep 17 00:00:00 2001
From: Sergey Semenov <ssemenov@ebay.com>
Date: Tue, 7 Apr 2015 16:06:58 +0300
Subject: [PATCH 12/17] MAGETWO-34747: There is no ability to create condition
 based on "Attribute Set"

---
 app/code/Magento/Eav/Model/Config.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Eav/Model/Config.php b/app/code/Magento/Eav/Model/Config.php
index 90c6560658f09..96482c7bcbb9c 100644
--- a/app/code/Magento/Eav/Model/Config.php
+++ b/app/code/Magento/Eav/Model/Config.php
@@ -447,6 +447,7 @@ public function getAttribute($entityType, $code)
                     1
                 );
             }
+            $attribute->setEntityType($entityType)->setEntityTypeId($entityType->getId());
             $this->_addAttributeReference($code, $code, $entityTypeCode);
             $this->_save($attribute, $attributeKey);
         }

From e56b7055b66a77dcadedb35c1c28d196c6dc1094 Mon Sep 17 00:00:00 2001
From: Sergey Semenov <ssemenov@ebay.com>
Date: Tue, 7 Apr 2015 20:04:19 +0300
Subject: [PATCH 13/17] MAGETWO-35274: Specified product field custom options
 is not displayed in wishlist (backend)

---
 .../Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js   | 3 ---
 .../TestCase/ViewProductInCustomerWishlistOnBackendTest.xml    | 1 -
 2 files changed, 4 deletions(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
index 420388ee1b869..7380856e9cc84 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
@@ -67,9 +67,6 @@ define([
             var data = {},
                 elementName = $(element).attr('name'),
                 elementValue = $(element).val();
-            if (origin && $(element).is('select')) {
-                elementValue = $(element).find('option');
-            }
             if ($(element).is('select[multiple]')) {
                 $.each(elementValue, function(key, option) {
                     var value = origin ? option.value : option;
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml
index dce22aaba1196..f180b40e21440 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml
@@ -8,7 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Wishlist\Test\TestCase\ViewProductInCustomerWishlistOnBackendTest">
         <variation name="ViewProductInCustomerWishlistOnBackendTestVariation1">
-            <data name="issue" xsi:type="string">Bug: MAGETWO-35274</data>
             <data name="product" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductInCustomerWishlistOnBackendGrid" />
         </variation>

From 7ea64bdc78eba1ab50796bd1d1c9ac26b872a5b1 Mon Sep 17 00:00:00 2001
From: Sergey Semenov <ssemenov@ebay.com>
Date: Tue, 7 Apr 2015 20:33:36 +0300
Subject: [PATCH 14/17] MAGETWO-35273: Specified details for Grouped product
 are lost after adding to wishlist

---
 .../ConfigureProductInCustomerWishlistOnFrontendTest.xml         | 1 -
 .../Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml
index 4df49a5a0d7a2..835509955c51d 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml
@@ -28,7 +28,6 @@
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
         </variation>
         <variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation5">
-            <data name="issue" xsi:type="string">Bug: MAGETWO-35273</data>
             <data name="product" xsi:type="string">groupedProduct::three_simple_products</data>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml
index dce22aaba1196..95f08ccadd84a 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.xml
@@ -26,7 +26,6 @@
             <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductInCustomerWishlistOnBackendGrid" />
         </variation>
         <variation name="ViewProductInCustomerWishlistOnBackendTestVariation5">
-            <data name="issue" xsi:type="string">Bug: MAGETWO-35273</data>
             <data name="product" xsi:type="string">groupedProduct::three_simple_products</data>
             <constraint name="Magento\GroupedProduct\Test\Constraint\AssertGroupedProductInCustomerWishlistOnBackendGrid" />
         </variation>

From d60aab4f2a74e03e672b574a5eda2ca95c98646a Mon Sep 17 00:00:00 2001
From: Sergey Semenov <ssemenov@ebay.com>
Date: Wed, 8 Apr 2015 20:15:33 +0300
Subject: [PATCH 15/17] MAGETWO-35274: Specified product field custom options
 is not displayed in wishlist (backend)

---
 .../Product/View/Options/Type/Select.php      |  4 +-
 .../view/frontend/web/js/add-to-wishlist.js   | 44 ++++++++++++-------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
index 2ee644bacd6a6..f6d056298b390 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
@@ -43,7 +43,7 @@ public function getValuesHtml()
             if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DROP_DOWN) {
                 $select->setName('options[' . $_option->getid() . ']')->addOption('', __('-- Please Select --'));
             } else {
-                $select->setName('options[' . $_option->getid() . '][]');
+                $select->setName('options[' . $_option->getid() . ']');
                 $select->setClass('multiselect' . $require . ' product-custom-option');
             }
             foreach ($_option->getValues() as $_value) {
@@ -138,7 +138,7 @@ public function getValuesHtml()
                     ' name="options[' .
                     $_option->getId() .
                     ']' .
-                    $arraySign .
+                    (!empty($arraySign) ? '[' . $htmlValue . ']' : '') .
                     '" id="options_' .
                     $_option->getId() .
                     '_' .
diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
index 7380856e9cc84..ac86a43736a43 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
@@ -32,53 +32,67 @@ define([
             this._on(events);
         },
         _updateWishlistData: function(event) {
-            var dataToAdd = {},
-                dataOrigin = {};
+            var dataToAdd = {};
+            if (event.handleObj.selector == this.options.qtyInfo) {
+                this._updateAddToWishlistButton({});
+                event.stopPropagation();
+                return;
+            }
             var self = this;
             $(event.handleObj.selector).each(function(index, element){
-                dataOrigin = $.extend({}, dataOrigin, self._getElementData(element, 1));
+                if ($(element).attr('type') == 'text') {
+                    dataToAdd = $.extend({}, dataToAdd, self._getElementData(element));
+                    return;
+                }
                 if ($(element).is(':checked') || $(element).find(':checked').length) {
                     dataToAdd = $.extend({}, dataToAdd, self._getElementData(element));
-                } else {
-                    dataToAdd = dataOrigin;
                 }
             });
+
+            this._updateAddToWishlistButton(dataToAdd);
+            event.stopPropagation();
+        },
+        _updateAddToWishlistButton: function(dataToAdd) {
+            var self = this;
             $('[data-action="add-to-wishlist"]').each(function(index, element) {
                 var params = $(element).data('post');
                 if (!params)
                     params = {};
 
-                self._removeExcessiveData(params, dataOrigin, dataToAdd);
-                params.data = $.extend({}, params.data, dataToAdd, {'qty': $(self.options.qtyInfo).val()});
+                if (!$.isEmptyObject(dataToAdd)) {
+                    self._removeExcessiveData(params, dataToAdd);
+                }
 
+                params.data = $.extend({}, params.data, dataToAdd, {'qty': $(self.options.qtyInfo).val()});
                 $(element).data('post', params);
             });
-            event.stopPropagation();
         },
         _arrayDiffByKeys: function(array1, array2) {
             var result = {};
             $.each(array1, function(key, value) {
+                if (key.indexOf('option') === -1) {
+                    return;
+                }
                 if (!array2[key])
                     result[key] = value;
             });
             return result;
         },
-        _getElementData: function(element, origin) {
+        _getElementData: function(element) {
             var data = {},
                 elementName = $(element).attr('name'),
                 elementValue = $(element).val();
-            if ($(element).is('select[multiple]')) {
-                $.each(elementValue, function(key, option) {
-                    var value = origin ? option.value : option;
-                    data[elementName + '[' + value + ']'] = value;
+            if ($(element).is('select[multiple]') && elementValue !== null) {
+                $.each(elementValue, function (key, option) {
+                    data[elementName + '[' + option + ']'] = option;
                 });
             } else {
                 data[elementName] = elementValue;
             }
             return data;
         },
-        _removeExcessiveData: function(params, dataOrigin, dataToAdd) {
-            var dataToRemove = this._arrayDiffByKeys(dataOrigin, dataToAdd);
+        _removeExcessiveData: function(params, dataToAdd) {
+            var dataToRemove = this._arrayDiffByKeys(params.data, dataToAdd);
             $.each(dataToRemove, function(key, value) {
                 delete params.data[key];
             });

From befed84be685c28124823ca3cbd618e63ba79642 Mon Sep 17 00:00:00 2001
From: Sergey Semenov <ssemenov@ebay.com>
Date: Fri, 10 Apr 2015 16:17:31 +0300
Subject: [PATCH 16/17] MAGETWO-19632: Product specific details are lost after
 adding to wishlist

---
 .../Wishlist/view/frontend/templates/item/configure/addto.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml
index 5a5133f980e51..f58b669ae60d1 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml
@@ -25,7 +25,7 @@
 <script type="text/x-magento-init">
     {
         "body": {
-            "addToWishlist": <?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(['productType' => $_product->getTypeId()])?>
+            "addToWishlist": <?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWishlistOptions())?>
         }
     }
 </script>
\ No newline at end of file

From 417b95e8d24b430193a986a53cc96827e5abcd7d Mon Sep 17 00:00:00 2001
From: Maxim Medinskiy <mmedinskiy@ebay.com>
Date: Fri, 10 Apr 2015 17:06:03 +0300
Subject: [PATCH 17/17] MAGETWO-36010: Checkout doesn't work with JS bundling
 enabled in production mode

---
 lib/web/jquery/jquery.validate.js    | 32 ++++++++++++++--------------
 lib/web/mage/translate-inline-vde.js |  3 ++-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/lib/web/jquery/jquery.validate.js b/lib/web/jquery/jquery.validate.js
index 85d0621b02244..a7f85a23137a4 100644
--- a/lib/web/jquery/jquery.validate.js
+++ b/lib/web/jquery/jquery.validate.js
@@ -288,22 +288,22 @@
         },
 
         messages: {
-            required: $.mage.__("This field is required."),
-            remote: $.mage.__("Please fix this field."),
-            email: $.mage.__("Please enter a valid email address."),
-            url: $.mage.__("Please enter a valid URL."),
-            date: $.mage.__("Please enter a valid date."),
-            dateISO: $.mage.__("Please enter a valid date (ISO)."),
-            number: $.mage.__("Please enter a valid number."),
-            digits: $.mage.__("Please enter only digits."),
-            creditcard: $.mage.__("Please enter a valid credit card number."),
-            equalTo: $.mage.__("Please enter the same value again."),
-            maxlength: $.validator.format($.mage.__("Please enter no more than {0} characters.")),
-            minlength: $.validator.format($.mage.__("Please enter at least {0} characters.")),
-            rangelength: $.validator.format($.mage.__("Please enter a value between {0} and {1} characters long.")),
-            range: $.validator.format($.mage.__("Please enter a value between {0} and {1}.")),
-            max: $.validator.format($.mage.__("Please enter a value less than or equal to {0}.")),
-            min: $.validator.format($.mage.__("Please enter a value greater than or equal to {0}."))
+            required: "This field is required.",
+            remote: "Please fix this field.",
+            email: "Please enter a valid email address.",
+            url: "Please enter a valid URL.",
+            date: "Please enter a valid date.",
+            dateISO: "Please enter a valid date (ISO).",
+            number: "Please enter a valid number.",
+            digits: "Please enter only digits.",
+            creditcard: "Please enter a valid credit card number.",
+            equalTo: "Please enter the same value again.",
+            maxlength: $.validator.format("Please enter no more than {0} characters."),
+            minlength: $.validator.format("Please enter at least {0} characters."),
+            rangelength: $.validator.format("Please enter a value between {0} and {1} characters long."),
+            range: $.validator.format("Please enter a value between {0} and {1}."),
+            max: $.validator.format("Please enter a value less than or equal to {0}."),
+            min: $.validator.format("Please enter a value greater than or equal to {0}.")
         },
 
         autoCreateRanges: false,
diff --git a/lib/web/mage/translate-inline-vde.js b/lib/web/mage/translate-inline-vde.js
index 0e70103b8f06f..1e997b9492083 100644
--- a/lib/web/mage/translate-inline-vde.js
+++ b/lib/web/mage/translate-inline-vde.js
@@ -11,7 +11,8 @@
             "jquery",
             "mage/template",
             "jquery/ui",
-            "mage/translate-inline"
+            "mage/translate-inline",
+            "mage/translate"
         ], factory);
     } else {
         factory(root.jQuery, root.mageTemplate);