Merge branch '2.0' of https://github.corp.magento.com/magento-sparta/magento2ce into MDVA-53

Author: Yaroslav Voronoy

app/code/Magento/Cron/etc/di.xml

@@ -36,4 +36,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\AreaList">
+        <arguments>
+            <argument name="areas" xsi:type="array">
+                <item name="crontab" xsi:type="null" />
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/PageCache/Model/App/FrontController/MessageBox.php

@@ -9,7 +9,6 @@
     <type name="Magento\Framework\App\FrontControllerInterface">
         <plugin name="front-controller-builtin-cache" type="Magento\PageCache\Model\App\FrontController\BuiltinPlugin"/>
         <plugin name="front-controller-varnish-cache" type="Magento\PageCache\Model\App\FrontController\VarnishPlugin"/>
-        <plugin name="front-controller-message-box" type="Magento\PageCache\Model\App\FrontController\MessageBox" sortOrder="0"/>
     </type>
     <type name="Magento\Framework\Controller\ResultInterface">
         <plugin name="result-builtin-cache" type="Magento\PageCache\Model\Controller\Result\BuiltinPlugin"/>

app/code/Magento/PageCache/Test/Unit/Model/App/FrontController/MessageBoxTest.php

@@ -51,28 +51,6 @@ define([
         return elements;
     };
 
-    /**
-     * MsgBox Widget checks if message box is displayed and sets cookie
-     */
-    $.widget('mage.msgBox', {
-        options: {
-            msgBoxCookieName: 'message_box_display',
-            msgBoxSelector: '.main div.messages'
-        },
-
-        /**
-         * Creates widget 'mage.msgBox'
-         * @private
-         */
-        _create: function () {
-            if ($.mage.cookies.get(this.options.msgBoxCookieName)) {
-                $.mage.cookies.clear(this.options.msgBoxCookieName);
-            } else {
-                $(this.options.msgBoxSelector).hide();
-            }
-        }
-    });
-
     /**
      * FormKey Widget - this widget is generating from key, saves it to cookie and
      */
@@ -272,14 +250,12 @@ define([
 
     domReady(function () {
         $('body')
-            .msgBox()
             .formKey();
     });
 
     return {
         'pageCache': $.mage.pageCache,
-        'formKey': $.mage.formKey,
-        'msgBox': $.mage.msgBox
+        'formKey': $.mage.formKey
     };
 
     /**

app/code/Magento/PageCache/etc/frontend/di.xml

@@ -6,11 +6,10 @@
 
 namespace Magento\Setup\Model;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\Composer\ComposerJsonFinder;
 use Magento\Framework\Composer\MagentoComposerApplicationFactory;
-use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Setup\Model\UpdatePackagesCache;
 
 /**
  * Tests Magento\Framework\ComposerInformation
@@ -88,19 +87,19 @@ public function testGetPackagesForUpdate()
             ->method('get')
             ->willReturn($this->objectManager);
 
-        /** @var \Magento\Setup\Model\UpdatePackagesCache $updatePackagesCache */
-        $updatePackagesCache = $this->objectManager->create(
-            'Magento\Setup\Model\UpdatePackagesCache',
-            [
-                'applicationFactory' => new MagentoComposerApplicationFactory(
-                    $this->composerJsonFinder,
-                    $this->directoryList
-                ),
-                'filesystem' => $this->filesystem,
-                'composerInformation' => $this->composerInformation,
-                'objectManagerProvider' => $objectManagerProvider,
+        /** @var UpdatePackagesCache $updatePackagesCache|\PHPUnit_Framework_MockObject_MockObject */
+        $updatePackagesCache = $this->getMock('Magento\Setup\Model\UpdatePackagesCache', [], [], '', false);
+
+        $packages = [
+            'packages' => [
+                $packageName => [
+                    'latestVersion' => '1000.100.200'
+                ]
             ]
-        );
+        ];
+
+        $updatePackagesCache->expects($this->once())->method('syncPackagesForUpdate')->willReturn(true);
+        $updatePackagesCache->expects($this->once())->method('getPackagesForUpdate')->willReturn($packages);
 
         $requiredPackages = $this->composerInformation->getInstalledMagentoPackages();
         $this->assertArrayHasKey($packageName, $requiredPackages);