From 907e166931735f3768bfc1dd855f8d9bb49a52d6 Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Wed, 27 Jul 2016 19:05:52 +0300
Subject: [PATCH 01/17] MAGETWO-55854: [FF, IE10] Switching between tabs
 doesn't work

---
 app/code/Magento/Ui/view/base/web/js/lib/step-wizard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/lib/step-wizard.js b/app/code/Magento/Ui/view/base/web/js/lib/step-wizard.js
index ad4d680771c07..e598b5f567a84 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/step-wizard.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/step-wizard.js
@@ -213,7 +213,7 @@ define([
                 modal.closeModal();
             }
         },
-        showSpecificStep: function () {
+        showSpecificStep: function (data, event) {
             var index = _.indexOf(this.stepsNames, event.target.hash.substr(1)),
                 stepName = this.wizard.move(index);
 

From 9cb1818f9ad7a7ce7c596be8849a391c486e5a65 Mon Sep 17 00:00:00 2001
From: Stanislav Lopukhov <slopukhov@magento.com>
Date: Thu, 28 Jul 2016 11:04:07 +0300
Subject: [PATCH 02/17] MAGETWO-55896: Storefront: My Orders: Missing an Action
 column header

---
 .../Magento/Sales/view/frontend/templates/order/history.phtml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
index a57c68d17258f..47ea803530f14 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
@@ -21,7 +21,7 @@
                     <th scope="col" class="col shipping"><?php /* @escapeNotVerified */ echo __('Ship To') ?></th>
                     <th scope="col" class="col total"><?php /* @escapeNotVerified */ echo __('Order Total') ?></th>
                     <th scope="col" class="col status"><?php /* @escapeNotVerified */ echo __('Status') ?></th>
-                    <th scope="col" class="col actions">&nbsp;</th>
+                    <th scope="col" class="col actions"><?php /* @escapeNotVerified */ echo __('Action') ?></th>
                 </tr>
             </thead>
             <tbody>

From f054b5c3a8566ada0ad35a74ff2fa6ddce2f393e Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <bkorablov@magento.com>
Date: Thu, 28 Jul 2016 16:02:17 +0300
Subject: [PATCH 03/17] MAGETWO-54716: Unable to setup Magento via web
 installer

---
 .../Command/SampleDataDeployCommand.php       |  21 +++
 .../Command/SampleDataDeployCommandTest.php   | 151 +++++++++++++++---
 2 files changed, 151 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
index 668c22073f00a..61ad377b841a6 100644
--- a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
+++ b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
@@ -17,6 +17,7 @@
 use Magento\Framework\Filesystem;
 use Composer\Console\Application;
 use Composer\Console\ApplicationFactory;
+use Magento\Setup\Model\PackagesAuth;
 
 /**
  * Command for deployment of Sample Data
@@ -79,6 +80,7 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->updateMemoryLimit();
+        $this->createAuthFile();
         $sampleDataPackages = $this->sampleDataDependency->getSampleDataPackages();
         if (!empty($sampleDataPackages)) {
             $baseDir = $this->filesystem->getDirectoryRead(DirectoryList::ROOT)->getAbsolutePath();
@@ -107,6 +109,25 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
     }
 
+    /**
+     * Create new auth.json file if it doesn't exist.
+     *
+     * @return void
+     * @throws \Exception
+     */
+    private function createAuthFile()
+    {
+        $directory = $this->filesystem->getDirectoryWrite(DirectoryList::COMPOSER_HOME);
+        
+        if (!$directory->isExist(PackagesAuth::PATH_TO_AUTH_FILE)) {
+            try {
+                $directory->writeFile(PackagesAuth::PATH_TO_AUTH_FILE, '{}');
+            } catch (\Exception $e) {
+                throw new \Exception('Error in writing Auth file. Please check permissions for writing.');
+            }
+        }
+    }
+
     /**
      * @return void
      */
diff --git a/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php b/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php
index b3146087e8bd1..1294384d51afa 100644
--- a/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php
+++ b/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php
@@ -7,36 +7,103 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\SampleData\Console\Command\SampleDataDeployCommand;
+use Magento\Setup\Model\PackagesAuth;
 use Symfony\Component\Console\Tester\CommandTester;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\SampleData\Model\Dependency;
+use Symfony\Component\Console\Input\ArrayInputFactory;
+use Composer\Console\ApplicationFactory;
+use Composer\Console\Application;
 
 class SampleDataDeployCommandTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var ReadInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $directoryReadMock;
+
+    /**
+     * @var WriteInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $directoryWriteMock;
+
+    /**
+     * @var Filesystem|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $filesystemMock;
+
+    /**
+     * @var Dependency|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $sampleDataDependencyMock;
+
+    /**
+     * @var ArrayInputFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $arrayInputFactoryMock;
+
+    /**
+     * @var Application|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $applicationMock;
+
+    /**
+     * @var ApplicationFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $applicationFactoryMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->directoryReadMock = $this->getMock(ReadInterface::class, [], [], '', false);
+        $this->directoryWriteMock = $this->getMock(WriteInterface::class, [], [], '', false);
+        $this->filesystemMock = $this->getMock(Filesystem::class, [], [], '', false);
+        $this->sampleDataDependencyMock = $this->getMock(Dependency::class, [], [], '', false);
+        $this->arrayInputFactoryMock = $this->getMock(ArrayInputFactory::class, [], [], '', false);
+        $this->applicationMock = $this->getMock(Application::class, [], [], '', false);
+        $this->applicationFactoryMock = $this->getMock(ApplicationFactory::class, ['create'], [], '', false);
+    }
+
     /**
      * @param array     $sampleDataPackages
      * @param int       $appRunResult - int 0 if everything went fine, or an error code
      * @param string    $expectedMsg
+     * @param bool      $authExist
      * @return          void
      *
      * @dataProvider processDataProvider
      */
-    public function testExecute(array $sampleDataPackages, $appRunResult, $expectedMsg)
+    public function testExecute(array $sampleDataPackages, $appRunResult, $expectedMsg, $authExist)
     {
-        $directoryRead = $this->getMock('\Magento\Framework\Filesystem\Directory\ReadInterface', [], [], '', false);
-        $directoryRead->expects($this->any())->method('getAbsolutePath')->willReturn('/path/to/composer.json');
-
-        $filesystem = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
-        $filesystem->expects($this->any())->method('getDirectoryRead')->with(DirectoryList::ROOT)
-            ->willReturn($directoryRead);
+        $pathToComposerJson = '/path/to/composer.json';
 
-        $sampleDataDependency = $this->getMock('Magento\SampleData\Model\Dependency', [], [], '', false);
-        $sampleDataDependency
-            ->expects($this->any())
+        $this->directoryReadMock->expects($this->any())
+            ->method('getAbsolutePath')
+            ->willReturn($pathToComposerJson);
+        $this->directoryWriteMock->expects($this->once())
+            ->method('isExist')
+            ->with(PackagesAuth::PATH_TO_AUTH_FILE)
+            ->willReturn($authExist);
+        $this->directoryWriteMock->expects($authExist ? $this->never() : $this->once())
+            ->method('writeFile')
+            ->with(PackagesAuth::PATH_TO_AUTH_FILE, '{}');
+        $this->filesystemMock->expects($this->any())
+            ->method('getDirectoryRead')
+            ->with(DirectoryList::ROOT)
+            ->willReturn($this->directoryReadMock);
+        $this->filesystemMock->expects($this->once())
+            ->method('getDirectoryWrite')
+            ->with(DirectoryList::COMPOSER_HOME)
+            ->willReturn($this->directoryWriteMock);
+        $this->sampleDataDependencyMock->expects($this->any())
             ->method('getSampleDataPackages')
             ->willReturn($sampleDataPackages);
-
-        $arrayInputFactory = $this
-            ->getMock('Symfony\Component\Console\Input\ArrayInputFactory', ['create'], [], '', false);
-        $arrayInputFactory->expects($this->never())->method('create');
+        $this->arrayInputFactoryMock->expects($this->never())
+            ->method('create');
 
         array_walk($sampleDataPackages, function (&$v, $k) {
             $v = "$k:$v";
@@ -46,24 +113,32 @@ public function testExecute(array $sampleDataPackages, $appRunResult, $expectedM
 
         $requireArgs = [
             'command'       => 'require',
-            '--working-dir' => '/path/to/composer.json',
+            '--working-dir' => $pathToComposerJson,
             '--no-progress' => 1,
             'packages'      => $packages,
         ];
         $commandInput = new \Symfony\Component\Console\Input\ArrayInput($requireArgs);
 
-        $application = $this->getMock('Composer\Console\Application', [], [], '', false);
-        $application->expects($this->any())->method('run')
+        $this->applicationMock->expects($this->any())
+            ->method('run')
             ->with($commandInput, $this->anything())
             ->willReturn($appRunResult);
+
         if (($appRunResult !== 0) && !empty($sampleDataPackages)) {
-            $application->expects($this->once())->method('resetComposer')->willReturnSelf();
+            $this->applicationMock->expects($this->once())->method('resetComposer')->willReturnSelf();
         }
-        $applicationFactory = $this->getMock('Composer\Console\ApplicationFactory', ['create'], [], '', false);
-        $applicationFactory->expects($this->any())->method('create')->willReturn($application);
+
+        $this->applicationFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->applicationMock);
 
         $commandTester = new CommandTester(
-            new SampleDataDeployCommand($filesystem, $sampleDataDependency, $arrayInputFactory, $applicationFactory)
+            new SampleDataDeployCommand(
+                $this->filesystemMock,
+                $this->sampleDataDependencyMock,
+                $this->arrayInputFactoryMock,
+                $this->applicationFactoryMock
+            )
         );
         $commandTester->execute([]);
 
@@ -80,6 +155,7 @@ public function processDataProvider()
                 'sampleDataPackages' => [],
                 'appRunResult' => 1,
                 'expectedMsg' => 'There is no sample data for current set of modules.' . PHP_EOL,
+                'authExist' => true,
             ],
             [
                 'sampleDataPackages' => [
@@ -88,6 +164,7 @@ public function processDataProvider()
                 'appRunResult' => 1,
                 'expectedMsg' => 'There is an error during sample data deployment. Composer file will be reverted.'
                     . PHP_EOL,
+                'authExist' => false,
             ],
             [
                 'sampleDataPackages' => [
@@ -95,7 +172,39 @@ public function processDataProvider()
                 ],
                 'appRunResult' => 0,
                 'expectedMsg' => '',
+                'authExist' => true,
             ],
         ];
     }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Error in writing Auth file. Please check permissions for writing.
+     * @return void
+     */
+    public function testExecuteWithException()
+    {
+        $this->directoryWriteMock->expects($this->once())
+            ->method('isExist')
+            ->with(PackagesAuth::PATH_TO_AUTH_FILE)
+            ->willReturn(false);
+        $this->directoryWriteMock->expects($this->once())
+            ->method('writeFile')
+            ->with(PackagesAuth::PATH_TO_AUTH_FILE, '{}')
+            ->willThrowException(new \Exception('Something went wrong...'));
+        $this->filesystemMock->expects($this->once())
+            ->method('getDirectoryWrite')
+            ->with(DirectoryList::COMPOSER_HOME)
+            ->willReturn($this->directoryWriteMock);
+
+        $commandTester = new CommandTester(
+            new SampleDataDeployCommand(
+                $this->filesystemMock,
+                $this->sampleDataDependencyMock,
+                $this->arrayInputFactoryMock,
+                $this->applicationFactoryMock
+            )
+        );
+        $commandTester->execute([]);
+    }
 }

From e59af3042eb96f7f9d1838d04492b40c988f1a70 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <bkorablov@magento.com>
Date: Thu, 28 Jul 2016 16:36:29 +0300
Subject: [PATCH 04/17] MAGETWO-54716: Unable to setup Magento via web
 installer

---
 .../SampleData/Console/Command/SampleDataDeployCommand.php     | 1 +
 .../Test/Unit/Console/Command/SampleDataDeployCommandTest.php  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
index 61ad377b841a6..91f14860808c0 100644
--- a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
+++ b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
@@ -21,6 +21,7 @@
 
 /**
  * Command for deployment of Sample Data
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SampleDataDeployCommand extends Command
 {
diff --git a/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php b/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php
index 1294384d51afa..50a098724463d 100644
--- a/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php
+++ b/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php
@@ -17,6 +17,9 @@
 use Composer\Console\ApplicationFactory;
 use Composer\Console\Application;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class SampleDataDeployCommandTest extends \PHPUnit_Framework_TestCase
 {
     /**

From 1a09ba255626043137351e94610cdba508a6058c Mon Sep 17 00:00:00 2001
From: Oleksandr Shmyheliuk <oleksandr.shmyheliuk@gmail.com>
Date: Mon, 1 Aug 2016 12:00:51 +0300
Subject: [PATCH 05/17] MAGETWO-53428: Product catalog Import/export - Date &
 Timezone issue

---
 .../Model/Export/Product.php                  | 20 ++++++++++++++++++-
 .../Model/Import/Product.php                  | 17 +++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index 441fb60f55ec4..db67793e4b40d 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -254,6 +254,16 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
         'tax_class_id' => 'tax_class_name',
     ];
 
+    /**
+     * Attributes codes which shows as date
+     *
+     * @var array
+     */
+    protected $dateAttrCodes = [
+        'special_from_date',
+        'special_to_date'
+    ];
+
     /**
      * Attributes codes which are appropriate for export and not the part of additional_attributes.
      *
@@ -897,7 +907,15 @@ protected function collectRawData()
                     }
                     $fieldName = isset($this->_fieldsMap[$code]) ? $this->_fieldsMap[$code] : $code;
 
-                    if ($this->_attributeTypes[$code] === 'datetime') {
+                    if (in_array($code, $this->dateAttrCodes)) {
+                        $attrValue = $this->_localeDate->formatDateTime(
+                            new \DateTime($attrValue),
+                            \IntlDateFormatter::SHORT,
+                            \IntlDateFormatter::NONE,
+                            null,
+                            date_default_timezone_get()
+                        );
+                    } else if ($this->_attributeTypes[$code] === 'datetime') {
                         $attrValue = $this->_localeDate->formatDateTime(
                             new \DateTime($attrValue),
                             \IntlDateFormatter::SHORT,
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 970b8a1aaea0f..06448c1360ddc 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -209,6 +209,16 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         '_upsell_' => \Magento\Catalog\Model\Product\Link::LINK_TYPE_UPSELL,
     ];
 
+    /**
+     * Attributes codes which shows as date
+     *
+     * @var array
+     */
+    protected $dateAttrCodes = [
+        'special_from_date',
+        'special_to_date'
+    ];
+
     /**
      * Need to log in import history
      *
@@ -1642,7 +1652,12 @@ protected function _saveProducts()
                     $attrTable = $attribute->getBackend()->getTable();
                     $storeIds = [0];
 
-                    if ('datetime' == $attribute->getBackendType() && strtotime($attrValue)) {
+                    if (
+                        'datetime' == $attribute->getBackendType()
+                        && in_array($attribute->getAttributeCode(), $this->dateAttrCodes)
+                    ) {
+                        $attrValue = $this->dateTime->formatDate($attrValue, false);
+                    } else if ('datetime' == $attribute->getBackendType() && strtotime($attrValue)) {
                         $attrValue = $this->dateTime->gmDate(
                             'Y-m-d H:i:s',
                             $this->_localeDate->date($attrValue)->getTimestamp()

From 21b420943b95d3682cb7d893fcf341386be064f5 Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Mon, 1 Aug 2016 14:13:38 +0300
Subject: [PATCH 06/17] MAGETWO-55856: Merchant can't see the whole name in
 Columns Dropdown on Data-Grid

---
 .../Ui/view/base/web/templates/grid/controls/columns.html     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/controls/columns.html b/app/code/Magento/Ui/view/base/web/templates/grid/controls/columns.html
index c14044de44eb2..113806471bc9b 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/controls/columns.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/controls/columns.html
@@ -16,7 +16,9 @@
                     disable="isDisabled($col())"
                     ko-checked="$col().visible"
                     attr="id: ++ko.uid"/>
-                <label class="admin__field-label" text="$col().label" attr="for: ko.uid"/>
+                <label class="admin__field-label"
+                       text="$col().label"
+                       attr="for: ko.uid, title: $col().label"/>
             </div>
         </div>
         <div class="admin__action-dropdown-menu-footer">

From da80ad00a79bb2e2040820023d6256ff356dde19 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <bkorablov@magento.com>
Date: Mon, 1 Aug 2016 17:30:46 +0300
Subject: [PATCH 07/17] MAGETWO-54716: Unable to setup Magento via web
 installer

---
 .../Console/Command/SampleDataDeployCommand.php  | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
index 91f14860808c0..ba018d6d65cd2 100644
--- a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
+++ b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
@@ -21,7 +21,6 @@
 
 /**
  * Command for deployment of Sample Data
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SampleDataDeployCommand extends Command
 {
@@ -35,12 +34,6 @@ class SampleDataDeployCommand extends Command
      */
     private $sampleDataDependency;
 
-    /**
-     * @var ArrayInputFactory
-     * @deprecated
-     */
-    private $arrayInputFactory;
-
     /**
      * @var ApplicationFactory
      */
@@ -51,6 +44,7 @@ class SampleDataDeployCommand extends Command
      * @param Dependency $sampleDataDependency
      * @param ArrayInputFactory $arrayInputFactory
      * @param ApplicationFactory $applicationFactory
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function __construct(
         Filesystem $filesystem,
@@ -60,7 +54,6 @@ public function __construct(
     ) {
         $this->filesystem = $filesystem;
         $this->sampleDataDependency = $sampleDataDependency;
-        $this->arrayInputFactory = $arrayInputFactory;
         $this->applicationFactory = $applicationFactory;
         parent::__construct();
     }
@@ -113,6 +106,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
     /**
      * Create new auth.json file if it doesn't exist.
      *
+     * We create auth.json with correct permissions instead of relying on Composer.
+     *
      * @return void
      * @throws \Exception
      */
@@ -124,7 +119,10 @@ private function createAuthFile()
             try {
                 $directory->writeFile(PackagesAuth::PATH_TO_AUTH_FILE, '{}');
             } catch (\Exception $e) {
-                throw new \Exception('Error in writing Auth file. Please check permissions for writing.');
+                $message = 'Error in writing Auth file '
+                    . $directory->getAbsolutePath(PackagesAuth::PATH_TO_AUTH_FILE)
+                    . '. Please check permissions for writing.';
+                throw new \Exception($message);
             }
         }
     }

From 0492e89be695c0674071b60ae1f63a2222d5b000 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <bkorablov@magento.com>
Date: Mon, 1 Aug 2016 17:37:30 +0300
Subject: [PATCH 08/17] MAGETWO-54716: Unable to setup Magento via web
 installer

---
 .../Unit/Console/Command/SampleDataDeployCommandTest.php    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php b/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php
index 50a098724463d..4f337c61c729f 100644
--- a/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php
+++ b/app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php
@@ -182,7 +182,7 @@ public function processDataProvider()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Error in writing Auth file. Please check permissions for writing.
+     * @expectedExceptionMessage Error in writing Auth file path/to/auth.json. Please check permissions for writing.
      * @return void
      */
     public function testExecuteWithException()
@@ -195,6 +195,10 @@ public function testExecuteWithException()
             ->method('writeFile')
             ->with(PackagesAuth::PATH_TO_AUTH_FILE, '{}')
             ->willThrowException(new \Exception('Something went wrong...'));
+        $this->directoryWriteMock->expects($this->once())
+            ->method('getAbsolutePath')
+            ->with(PackagesAuth::PATH_TO_AUTH_FILE)
+            ->willReturn('path/to/auth.json');
         $this->filesystemMock->expects($this->once())
             ->method('getDirectoryWrite')
             ->with(DirectoryList::COMPOSER_HOME)

From 15747ffbb865f4386298ee08fb2619db25e53bc1 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <bkorablov@magento.com>
Date: Mon, 1 Aug 2016 19:13:30 +0300
Subject: [PATCH 09/17] MAGETWO-54716: Unable to setup Magento via web
 installer

---
 .../Console/Command/SampleDataDeployCommand.php          | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
index ba018d6d65cd2..3fd38ca57484c 100644
--- a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
+++ b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
@@ -21,6 +21,7 @@
 
 /**
  * Command for deployment of Sample Data
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SampleDataDeployCommand extends Command
 {
@@ -34,6 +35,12 @@ class SampleDataDeployCommand extends Command
      */
     private $sampleDataDependency;
 
+    /**
+     * @var ArrayInputFactory
+     * @deprecated
+     */
+    private $arrayInputFactory;
+
     /**
      * @var ApplicationFactory
      */
@@ -44,7 +51,6 @@ class SampleDataDeployCommand extends Command
      * @param Dependency $sampleDataDependency
      * @param ArrayInputFactory $arrayInputFactory
      * @param ApplicationFactory $applicationFactory
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function __construct(
         Filesystem $filesystem,
@@ -54,6 +60,7 @@ public function __construct(
     ) {
         $this->filesystem = $filesystem;
         $this->sampleDataDependency = $sampleDataDependency;
+        $this->arrayInputFactory = $arrayInputFactory;
         $this->applicationFactory = $applicationFactory;
         parent::__construct();
     }

From a8caca4a879790a4f08bfdc86f9d10c88305b52c Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <bkorablov@magento.com>
Date: Tue, 2 Aug 2016 10:24:14 +0300
Subject: [PATCH 10/17] MAGETWO-54716: Unable to setup Magento via web
 installer

---
 .../Console/Command/SampleDataDeployCommand.php           | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
index 3fd38ca57484c..d34a3570e62ae 100644
--- a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
+++ b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
@@ -12,7 +12,6 @@
 use Magento\SampleData\Model\Dependency;
 use Magento\Framework\App\State;
 use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\ArrayInputFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Composer\Console\Application;
@@ -21,7 +20,6 @@
 
 /**
  * Command for deployment of Sample Data
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SampleDataDeployCommand extends Command
 {
@@ -36,7 +34,7 @@ class SampleDataDeployCommand extends Command
     private $sampleDataDependency;
 
     /**
-     * @var ArrayInputFactory
+     * @var \Symfony\Component\Console\Input\ArrayInputFactory
      * @deprecated
      */
     private $arrayInputFactory;
@@ -49,13 +47,13 @@ class SampleDataDeployCommand extends Command
     /**
      * @param Filesystem $filesystem
      * @param Dependency $sampleDataDependency
-     * @param ArrayInputFactory $arrayInputFactory
+     * @param \Symfony\Component\Console\Input\ArrayInputFactory $arrayInputFactory
      * @param ApplicationFactory $applicationFactory
      */
     public function __construct(
         Filesystem $filesystem,
         Dependency $sampleDataDependency,
-        ArrayInputFactory $arrayInputFactory,
+        \Symfony\Component\Console\Input\ArrayInputFactory $arrayInputFactory,
         ApplicationFactory $applicationFactory
     ) {
         $this->filesystem = $filesystem;

From 4790c40ea204e47ae1b9d74abf2b10ddbddc6ee9 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <bkorablov@magento.com>
Date: Tue, 2 Aug 2016 10:46:22 +0300
Subject: [PATCH 11/17] MAGETWO-54716: Unable to setup Magento via web
 installer

---
 .../Command/SampleDataDeployCommand.php       | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
index d34a3570e62ae..7697c24df79e3 100644
--- a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
+++ b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
@@ -9,13 +9,10 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\SampleData\Model\Dependency;
 use Magento\Framework\App\State;
 use Symfony\Component\Console\Input\ArrayInput;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem;
 use Composer\Console\Application;
-use Composer\Console\ApplicationFactory;
 use Magento\Setup\Model\PackagesAuth;
 
 /**
@@ -24,12 +21,12 @@
 class SampleDataDeployCommand extends Command
 {
     /**
-     * @var Filesystem
+     * @var \Magento\Framework\Filesystem
      */
     private $filesystem;
 
     /**
-     * @var Dependency
+     * @var \Magento\SampleData\Model\Dependency
      */
     private $sampleDataDependency;
 
@@ -40,21 +37,21 @@ class SampleDataDeployCommand extends Command
     private $arrayInputFactory;
 
     /**
-     * @var ApplicationFactory
+     * @var \Composer\Console\ApplicationFactory
      */
     private $applicationFactory;
 
     /**
-     * @param Filesystem $filesystem
-     * @param Dependency $sampleDataDependency
+     * @param \Magento\Framework\Filesystem $filesystem
+     * @param \Magento\SampleData\Model\Dependency $sampleDataDependency
      * @param \Symfony\Component\Console\Input\ArrayInputFactory $arrayInputFactory
-     * @param ApplicationFactory $applicationFactory
+     * @param \Composer\Console\ApplicationFactory $applicationFactory
      */
     public function __construct(
-        Filesystem $filesystem,
-        Dependency $sampleDataDependency,
+        \Magento\Framework\Filesystem $filesystem,
+        \Magento\SampleData\Model\Dependency $sampleDataDependency,
         \Symfony\Component\Console\Input\ArrayInputFactory $arrayInputFactory,
-        ApplicationFactory $applicationFactory
+        \Composer\Console\ApplicationFactory $applicationFactory
     ) {
         $this->filesystem = $filesystem;
         $this->sampleDataDependency = $sampleDataDependency;

From d11d3a17e461f0270a7655edab2139dc26c8b6ad Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@magento.com>
Date: Wed, 3 Aug 2016 16:35:06 -0500
Subject: [PATCH 12/17] MAGETWO-55229: Problem while upgrading to 2.1.0

 - fixed
---
 app/code/Magento/Cms/Setup/UpgradeData.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Cms/Setup/UpgradeData.php b/app/code/Magento/Cms/Setup/UpgradeData.php
index 9a7dce65b121f..41a28989439af 100644
--- a/app/code/Magento/Cms/Setup/UpgradeData.php
+++ b/app/code/Magento/Cms/Setup/UpgradeData.php
@@ -235,8 +235,11 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
 </div>
 EOD;
             $privacyAndCookiePolicyPage = $this->createPage()->load(self::PRIVACY_COOKIE_PAGE_ID);
-            $privacyAndCookiePolicyPage->setContent($newPageContent);
-            $privacyAndCookiePolicyPage->save();
+            $privacyAndCookiePolicyPageId = $privacyAndCookiePolicyPage->getId();
+            if ($privacyAndCookiePolicyPageId) {
+                $privacyAndCookiePolicyPage->setContent($newPageContent);
+                $privacyAndCookiePolicyPage->save();
+            }
         }
         $setup->endSetup();
     }

From 329fdd803ae8f4836cad011987bbc18dcb381d96 Mon Sep 17 00:00:00 2001
From: Roman Ganin <rganin@magento.com>
Date: Thu, 4 Aug 2016 18:07:35 +0300
Subject: [PATCH 13/17] MAGETWO-55339: Upgrade failure

---
 app/code/Magento/Backend/etc/di.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml
index 7307bbe09f1b4..8b52d08da48fb 100644
--- a/app/code/Magento/Backend/etc/di.xml
+++ b/app/code/Magento/Backend/etc/di.xml
@@ -71,7 +71,6 @@
             <argument name="backendHelper" xsi:type="object">Magento\Backend\Helper\Data\Proxy</argument>
         </arguments>
     </type>
-    <preference for="Magento\Framework\Authorization\RoleLocatorInterface" type="Magento\Backend\Model\Authorization\RoleLocator" />
     <preference for="Magento\Framework\Authorization\PolicyInterface" type="Magento\Framework\Authorization\Policy\Acl"/>
     <preference for="Magento\Framework\Acl\AclResource\ProviderInterface" type="Magento\Framework\Acl\AclResource\Provider"/>
     <type name="Magento\Framework\Acl\AclResource\Config\Reader\Filesystem">

From 026a599577b45097f237d3acaf24bae347bd8e11 Mon Sep 17 00:00:00 2001
From: Stanislav Lopukhov <slopukhov@magento.com>
Date: Fri, 5 Aug 2016 11:48:30 +0300
Subject: [PATCH 14/17] MAGETWO-55755: Topmenu fix

---
 .../Magento/Catalog/Plugin/Block/Topmenu.php  |  13 +-
 .../Test/Unit/Plugin/Block/TopmenuTest.php    | 180 +++++++++---------
 2 files changed, 103 insertions(+), 90 deletions(-)

diff --git a/app/code/Magento/Catalog/Plugin/Block/Topmenu.php b/app/code/Magento/Catalog/Plugin/Block/Topmenu.php
index 098b3282a1b10..72bf4468080e3 100644
--- a/app/code/Magento/Catalog/Plugin/Block/Topmenu.php
+++ b/app/code/Magento/Catalog/Plugin/Block/Topmenu.php
@@ -79,11 +79,18 @@ public function beforeGetHtml(
         $currentCategory = $this->getCurrentCategory();
         $mapping = [$rootId => $subject->getMenu()];  // use nodes stack to avoid recursion
         foreach ($collection as $category) {
-            if (!isset($mapping[$category->getParentId()])) {
-                continue;
+            $categoryParentId = $category->getParentId();
+            if (!isset($mapping[$categoryParentId])) {
+                $parentIds = $category->getParentIds();
+                foreach ($parentIds as $parentId) {
+                    if (isset($mapping[$parentId])) {
+                        $categoryParentId = $parentId;
+                    }
+                }
             }
+
             /** @var Node $parentCategoryNode */
-            $parentCategoryNode = $mapping[$category->getParentId()];
+            $parentCategoryNode = $mapping[$categoryParentId];
 
             $categoryNode = new Node(
                 $this->getCategoryAsArray($category, $currentCategory),
diff --git a/app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php b/app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php
index 93e9a6f49e9a0..1f805016b7f51 100644
--- a/app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php
@@ -4,12 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Catalog\Test\Unit\Plugin\Block;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
+/**
+ * Class TopmenuTest
+ * 
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class TopmenuTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -18,96 +21,109 @@ class TopmenuTest extends \PHPUnit_Framework_TestCase
     protected $block;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Helper\Category
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
      */
-    protected $_catalogCategory;
+    protected $storeManagerMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Category
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\Store
      */
-    protected $_childrenCategory;
+    protected $storeMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Category
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Layer\Resolver
+     */
+    protected $layerResolverMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Layer
+     */
+    protected $catalogLayerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
      */
-    protected $_category;
+    protected $categoryCollectionFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\ResourceModel\Category\Collection
      */
-    protected $menuCategoryData;
+    protected $categoryCollectionMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Indexer\Category\Flat\State
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Helper\Category
+     */
+    protected $categoryHelperMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Category
+     */
+    protected $childrenCategoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Category
      */
-    protected $_categoryFlatState;
+    protected $categoryMock;
 
+    /**
+     * Set up
+     *
+     * @return void
+     */
     protected function setUp()
     {
-        $this->_catalogCategory = $this->getMock(
-            \Magento\Catalog\Helper\Category::class,
-            ['getStoreCategories', 'getCategoryUrl'],
-            [],
-            '',
-            false
+        $rootCategoryId = 2;
+        $categoryParentId = 3;
+        $categoryParentIds = [1, 2, 3];
+
+        $this->childrenCategoryMock = $this->_getCleanMock(\Magento\Catalog\Model\Category::class);
+        $this->categoryHelperMock = $this->_getCleanMock(\Magento\Catalog\Helper\Category::class);
+        $this->catalogLayerMock = $this->_getCleanMock(\Magento\Catalog\Model\Layer::class);
+        $this->categoryMock = $this->_getCleanMock(\Magento\Catalog\Model\Category::class);
+        $this->layerResolverMock = $this->_getCleanMock(\Magento\Catalog\Model\Layer\Resolver::class);
+        $this->storeMock = $this->_getCleanMock(\Magento\Store\Model\Store::class);
+        $this->storeManagerMock = $this->_getCleanMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->categoryCollectionMock = $this->_getCleanMock(
+            \Magento\Catalog\Model\ResourceModel\Category\Collection::class
         );
-
-        $this->menuCategoryData = $this->getMock(
-            \Magento\Catalog\Observer\MenuCategoryData::class,
-            ['getMenuCategoryData'],
+        $this->categoryCollectionFactoryMock = $this->getMock(
+            \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory::class,
+            ['create'],
             [],
             '',
             false
         );
 
-        $this->store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-            ->setMethods(['getRootCategoryId', 'getFilters', '__wakeup'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-            ->setMethods(['getStore'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $this->storeManager->expects($this->any())->method('getStore')
-            ->will($this->returnValue($this->store));
-
-        $this->store->expects($this->any())->method('getRootCategoryId')
-            ->will($this->returnValue(1));
-
-        $collectionFactory = $this->getMockBuilder(
-            \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory::class)
-            ->setMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $collection =  $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Category\Collection::class)
-            ->setMethods(
-                [
-                    'addIsActiveFilter',
-                    'addAttributeToSelect',
-                    'addFieldToFilter',
-                    'addAttributeToFilter',
-                    'addUrlRewriteToResult',
-                    'getIterator',
-                    'setStoreId'
-                ]
-            )->disableOriginalConstructor()
-            ->getMock();
-        $collection->expects($this->once())->method('addIsActiveFilter');
-        $collectionFactory->expects($this->once())->method('create')
-            ->willReturn($collection);
-
-        $collection->expects($this->once())->method('getIterator')
-            ->willReturn(new \ArrayIterator([]));
+        $this->catalogLayerMock->expects($this->once())->method('getCurrentCategory')
+            ->will($this->returnValue($this->childrenCategoryMock));
+
+        $this->storeManagerMock->expects($this->atLeastOnce())->method('getStore')
+            ->will($this->returnValue($this->storeMock));
+
+        $this->categoryMock->expects($this->atLeastOnce())->method('getParentId')
+            ->will($this->returnValue($categoryParentId));
+        $this->categoryMock->expects($this->once())->method('getParentIds')
+            ->will($this->returnValue($categoryParentIds));
+
+        $this->layerResolverMock->expects($this->once())->method('get')
+            ->will($this->returnValue($this->catalogLayerMock));
+
+        $this->storeMock->expects($this->once())->method('getRootCategoryId')
+            ->will($this->returnValue($rootCategoryId));
+
+        $this->categoryCollectionMock->expects($this->once())->method('getIterator')
+            ->willReturn(new \ArrayIterator([$this->categoryMock]));
+
+        $this->categoryCollectionFactoryMock->expects($this->once())->method('create')
+            ->willReturn($this->categoryCollectionMock);
 
         $this->block = (new ObjectManager($this))->getObject(
             \Magento\Catalog\Plugin\Block\Topmenu::class,
             [
-                'catalogCategory' => $this->_catalogCategory,
-                'menuCategoryData' => $this->menuCategoryData,
-                'storeManager' => $this->storeManager,
-                'categoryCollectionFactory' => $collectionFactory,
+                'catalogCategory' => $this->categoryHelperMock,
+                'categoryCollectionFactory' => $this->categoryCollectionFactoryMock,
+                'storeManager' => $this->storeManagerMock,
+                'layerResolver' => $this->layerResolverMock,
             ]
         );
     }
@@ -123,31 +139,21 @@ protected function _getCleanMock($className)
         return $this->getMock($className, [], [], '', false);
     }
 
-    protected function _preparationData()
+    /**
+     * Test beforeGetHtml
+     *
+     */
+    public function testBeforeGetHtml()
     {
-        $this->_childrenCategory = $this->getMock(
-            \Magento\Catalog\Model\Category::class,
-            ['getIsActive', '__wakeup'],
-            [],
-            '',
-            false
-        );
-
+        $treeMock = $this->getMock(\Magento\Framework\Data\Tree::class);
 
-        $this->_category = $this->getMock(
-            \Magento\Catalog\Model\Category::class,
-            ['getIsActive', '__wakeup', 'getName', 'getChildren', 'getUseFlatResource', 'getChildrenNodes'],
-            [],
-            '',
-            false
-        );
+        $parentCategoryNodeMock = $this->_getCleanMock(\Magento\Framework\Data\Tree\Node::class);
+        $parentCategoryNodeMock->expects($this->once())->method('getTree')->will($this->returnValue($treeMock));
+        $parentCategoryNodeMock->expects($this->once())->method('addChild');
 
         $blockMock = $this->_getCleanMock(\Magento\Theme\Block\Html\Topmenu::class);
-        return $blockMock;
-    }
+        $blockMock->expects($this->once())->method('getMenu')->will($this->returnValue($parentCategoryNodeMock));
 
-    public function testAddCatalogToTopMenuItems()
-    {
-        $this->block->beforeGetHtml($this->_preparationData());
+        $this->block->beforeGetHtml($blockMock);
     }
 }

From cde57daad905e5feace9182041b927becfca305f Mon Sep 17 00:00:00 2001
From: Oleksandr Shmyheliuk <oleksandr.shmyheliuk@gmail.com>
Date: Fri, 5 Aug 2016 13:38:48 +0300
Subject: [PATCH 15/17] MAGETWO-53428: Product catalog Import/export - Date &
 Timezone issue

- add possibility to change attribute by DI
---
 .../Magento/CatalogImportExport/Model/Export/Product.php     | 5 ++++-
 .../Magento/CatalogImportExport/Model/Import/Product.php     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index db67793e4b40d..73551f332d140 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -348,6 +348,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * @param Product\Type\Factory $_typeFactory
      * @param \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
      * @param \Magento\CatalogImportExport\Model\Export\RowCustomizerInterface $rowCustomizer
+     * @param array $dateAttrCodes
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -366,7 +367,8 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeColFactory,
         \Magento\CatalogImportExport\Model\Export\Product\Type\Factory $_typeFactory,
         \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider,
-        \Magento\CatalogImportExport\Model\Export\RowCustomizerInterface $rowCustomizer
+        \Magento\CatalogImportExport\Model\Export\RowCustomizerInterface $rowCustomizer,
+        array $dateAttrCodes = []
     ) {
         $this->_entityCollectionFactory = $collectionFactory;
         $this->_exportConfig = $exportConfig;
@@ -381,6 +383,7 @@ public function __construct(
         $this->_typeFactory = $_typeFactory;
         $this->_linkTypeProvider = $linkTypeProvider;
         $this->rowCustomizer = $rowCustomizer;
+        $this->dateAttrCodes = array_merge($this->dateAttrCodes, $dateAttrCodes);
 
         parent::__construct($localeDate, $config, $resource, $storeManager);
 
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 76e91c0ac1227..08c577bd552bc 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -673,6 +673,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * @param Product\TaxClassProcessor $taxClassProcessor
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param array $data
+     * @param array $dateAttrCodes
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -714,7 +715,8 @@ public function __construct(
         Product\TaxClassProcessor $taxClassProcessor,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Catalog\Model\Product\Url $productUrl,
-        array $data = []
+        array $data = [],
+        array $dateAttrCodes = []
     ) {
         $this->_eventManager = $eventManager;
         $this->stockRegistry = $stockRegistry;
@@ -743,6 +745,7 @@ public function __construct(
         $this->taxClassProcessor = $taxClassProcessor;
         $this->scopeConfig = $scopeConfig;
         $this->productUrl = $productUrl;
+        $this->dateAttrCodes = array_merge($this->dateAttrCodes, $dateAttrCodes);
         parent::__construct(
             $jsonHelper,
             $importExportData,

From 3c3b80f12d69a8e93eca1c35d13b48db2e726522 Mon Sep 17 00:00:00 2001
From: Oleksandr Shmyheliuk <oleksandr.shmyheliuk@gmail.com>
Date: Fri, 5 Aug 2016 14:03:01 +0300
Subject: [PATCH 16/17] MAGETWO-53428: Product catalog Import/export - Date &
 Timezone issue

- fix unit test
---
 .../Test/Unit/Model/Export/ProductTest.php                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php
index e0ea12740b964..c61cb03aefa41 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php
@@ -343,9 +343,9 @@ protected function setUp()
             $this->attributeColFactory,
             $this->typeFactory,
             $this->linkTypeProvider,
-            $this->rowCustomizer,
-            $this->metadataPool
+            $this->rowCustomizer
         );
+        $this->setPropertyValue($this->product, 'metadataPool', $this->metadataPool);
 
         $this->object = new StubProduct();
     }

From 51e07f604f733f99ae96e44940780216638f37ec Mon Sep 17 00:00:00 2001
From: Roman Ganin <rganin@magento.com>
Date: Fri, 5 Aug 2016 20:22:57 +0300
Subject: [PATCH 17/17] MAGETWO-55339: Upgrade failure

- fixed invalid integration tests
---
 .../integration/testsuite/Magento/Backend/Block/MenuTest.php    | 2 +-
 .../_files/menu/Magento/Backend/etc/{ => adminhtml}/menu.xml    | 0
 .../Controller/Adminhtml/Dashboard/ProductsViewedTest.php       | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename dev/tests/integration/testsuite/Magento/Backend/Block/_files/menu/Magento/Backend/etc/{ => adminhtml}/menu.xml (100%)

diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/MenuTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/MenuTest.php
index 93c3bf10e35bb..f36c17889aa30 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/MenuTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/MenuTest.php
@@ -10,7 +10,7 @@
 
 /**
  * Test class for \Magento\Backend\Block\Menu
- *
+ * @magentoAppArea adminhtml
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class MenuTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/menu/Magento/Backend/etc/menu.xml b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/menu/Magento/Backend/etc/adminhtml/menu.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Backend/Block/_files/menu/Magento/Backend/etc/menu.xml
rename to dev/tests/integration/testsuite/Magento/Backend/Block/_files/menu/Magento/Backend/etc/adminhtml/menu.xml
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php
index dacac8b0a9f9a..8537ce8d122af 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php
@@ -9,6 +9,7 @@
 class ProductsViewedTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     /**
+     * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/Reports/_files/viewed_products.php
      */
     public function testExecute()