Merge pull request #106 from magento-ogre/develop

[Ogre] Sprint 23 Contribution

Author: mazhalai

Gruntfile.js

@@ -35,10 +35,10 @@ module.exports = function (grunt) {
         tmpSource: 'var/view_preprocessed/source/',
         tmp: 'var',
         css: {
-            setup: 'setup/pub/magento/setup/css'
+            setup: 'setup/pub/styles'
         },
         less: {
-            setup: 'setup/module/Magento/Setup/styles'
+            setup: 'setup/view/styles'
         },
         uglify: {
             legacy: 'lib/web/legacy-build.min.js'

app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml

@@ -11,6 +11,6 @@ $helper = $this->helper('Magento\CatalogSearch\Helper\Data');
 ?>
 <div class="nested">
     <a class="action advanced" href="<?php echo $helper->getAdvancedSearchUrl(); ?>">
-        <?php echo __('Advanced Search (Modified Again)'); ?>
+        <?php echo __('Advanced Search'); ?>
     </a>
 </div>

app/design/frontend/Magento/luma/composer.json

@@ -17,7 +17,7 @@
         "map": [
             [
                 "*",
-                "Magento/luma"
+                "frontend/Magento/luma"
             ]
         ]
     }

app/etc/di.xml

@@ -21,7 +21,7 @@ class CustomizeStore extends Form
      *
      * @var string
      */
-    protected $next = "[ng-click*='next']";
+    protected $next = "[ng-click*='checkModuleConstraints']";
 
     /**
      * First field selector

app/etc/vendor_path.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup\Model;
+
+use Magento\Setup\Mvc\Bootstrap\InitParamListener;
+
+class ObjectManagerProviderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ObjectManagerProvider
+     */
+    private $object;
+
+    /**
+     * @var \Zend\ServiceManager\ServiceLocatorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $locator;
+
+    /**
+     * @var \Magento\Framework\App\DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfig;
+
+    protected function setUp()
+    {
+        $this->locator = $this->getMockForAbstractClass('Zend\ServiceManager\ServiceLocatorInterface');
+        $this->deploymentConfig = $this->getMock('Magento\Framework\App\DeploymentConfig', [], [], '', false);
+        $this->object = new ObjectManagerProvider($this->locator, $this->deploymentConfig);
+    }
+
+    public function testGet()
+    {
+        $this->locator->expects($this->once())->method('get')->with(InitParamListener::BOOTSTRAP_PARAM)->willReturn([]);
+        $objectManager = $this->object->get();
+        $this->assertInstanceOf('Magento\Framework\ObjectManagerInterface', $objectManager);
+        $this->assertSame($objectManager, $this->object->get());
+    }
+}

dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php

@@ -128,7 +128,6 @@ Magento/Usps/Model/Carrier
 Magento/Dhl/Model
 Magento/Shipping/Model
 Magento/Ui
-setup
 Magento/Sales/Service/V1
 Magento/Sales/Api
 Magento/Sales/Spi

dev/tests/integration/testsuite/Magento/Setup/Model/ObjectManagerFactoryTest.php

@@ -7,3 +7,4 @@ dev/tests/integration
 dev/tests/performance
 dev/tests/static
 dev/tests/unit
+setup

dev/tests/integration/testsuite/Magento/Setup/Model/ObjectManagerProviderTest.php

@@ -141,4 +141,29 @@ public function testCheckConflictWhenEnableModuleDifferentVersion()
             $conflictChecker->checkConflictsWhenEnableModules(['Vendor_C'])
         );
     }
+
+    public function testCheckConflictWhenEnableModuleDifferentVersionWithCurEnabledModules()
+    {
+        $moduleListMock = $this->getMock('Magento\Framework\Module\ModuleList', [], [], '', false);
+        $packageInfoMock = $this->getMock('Magento\Framework\Module\PackageInfo', [], [], '', false);
+        $packageInfoMock->expects($this->any())
+            ->method('getConflict')
+            ->will($this->returnValueMap([
+                ['Vendor_A', []],
+                ['Vendor_B', []],
+                ['Vendor_C', ['Vendor_A' => '>=0.2,<0.3', 'Vendor_B' => '<0.4']]
+            ]));
+        $packageInfoMock->expects($this->any())
+            ->method('getVersion')
+            ->will($this->returnValueMap([['Vendor_A', '0.2'], ['Vendor_B', '0.4']]));
+        $packageInfoFactoryMock = $this->getMock('Magento\Framework\Module\PackageInfoFactory', [], [], '', false);
+        $packageInfoFactoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($packageInfoMock));
+        $conflictChecker = new ConflictChecker($moduleListMock, $packageInfoFactoryMock);
+        $this->assertEquals(
+            ['Vendor_C' => ['Vendor_C conflicts with current Vendor_A version 0.2 (version should not be >=0.2,<0.3)']],
+            $conflictChecker->checkConflictsWhenEnableModules(['Vendor_C'], ['Vendor_A', 'Vendor_B'])
+        );
+    }
 }

dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt

@@ -65,6 +65,7 @@ public function setUp()
             ->method('load')
             ->will($this->returnValue(['A' => [], 'B' => [], 'C' => [], 'D' => [], 'E' => []]));
     }
+
     public function testCheckDependenciesWhenDisableModules()
     {
         $this->listMock
@@ -78,6 +79,15 @@ public function testCheckDependenciesWhenDisableModules()
         $this->assertEquals($expected, $actual);
     }
 
+    public function testCheckDependenciesWhenDisableModulesWithCurEnabledModules()
+    {
+        $this->checker = new DependencyChecker($this->listMock, $this->loaderMock, $this->packageInfoFactoryMock);
+
+        $actual = $this->checker->checkDependenciesWhenDisableModules(['B', 'D'], ['C', 'D', 'E']);
+        $expected = ['B' => [], 'D' => []];
+        $this->assertEquals($expected, $actual);
+    }
+
     public function testCheckDependenciesWhenEnableModules()
     {
         $this->listMock
@@ -92,4 +102,15 @@ public function testCheckDependenciesWhenEnableModules()
         ];
         $this->assertEquals($expected, $actual);
     }
+
+    public function testCheckDependenciesWhenEnableModulesWithCurEnabledModules()
+    {
+        $this->checker = new DependencyChecker($this->listMock, $this->loaderMock, $this->packageInfoFactoryMock);
+        $actual = $this->checker->checkDependenciesWhenEnableModules(['B', 'D'], ['C']);
+        $expected = [
+            'B' => ['A' => ['B', 'D', 'A'], 'E' => ['B', 'E']],
+            'D' => ['A' => ['D', 'A'], 'E' => ['D', 'A', 'B', 'E']],
+        ];
+        $this->assertEquals($expected, $actual);
+    }
 }

dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt

@@ -69,7 +69,11 @@ public function testCheckConstraintsEnableAllowed()
         $this->dependencyChecker->expects($this->once())
             ->method('checkDependenciesWhenEnableModules')
             ->will($this->returnValue(['Module_Foo' => [], 'Module_Bar' => []]));
-        $result = $this->object->checkConstraints(true, ['Module_Foo' => '', 'Module_Bar' => '']);
+        $result = $this->object->checkConstraints(
+            true,
+            ['Module_Foo' => '', 'Module_Bar' => ''],
+            ['Module_baz', 'Module_quz']
+        );
         $this->assertEquals([], $result);
     }
 
@@ -86,7 +90,7 @@ public function testCheckConstraintsEnableNotAllowed()
                     'Module_Bar' => ['Module_Baz' => ['Module_Bar', 'Module_Baz']],
                 ]
             ));
-        $result = $this->object->checkConstraints(true, ['Module_Foo' => '', 'Module_Bar' => '']);
+        $result = $this->object->checkConstraints(true, ['Module_Foo' => '', 'Module_Bar' => ''], [], false);
         $expect = [
             'Cannot enable Module_Foo, depending on disabled modules:',
             "Module_Baz: Module_Foo->Module_Baz",
@@ -100,6 +104,31 @@ public function testCheckConstraintsEnableNotAllowed()
         $this->assertEquals($expect, $result);
     }
 
+    public function testCheckConstraintsEnableNotAllowedWithPrettyMsg()
+    {
+        $this->conflictChecker->expects($this->once())
+            ->method('checkConflictsWhenEnableModules')
+            ->will($this->returnValue(['Module_Foo' => ['Module_Bar'], 'Module_Bar' => ['Module_Foo']]));
+        $this->dependencyChecker->expects($this->once())
+            ->method('checkDependenciesWhenEnableModules')
+            ->will($this->returnValue(
+                [
+                    'Module_Foo' => ['Module_Baz' => ['Module_Foo', 'Module_Baz']],
+                    'Module_Bar' => ['Module_Baz' => ['Module_Bar', 'Module_Baz']],
+                ]
+            ));
+        $result = $this->object->checkConstraints(true, ['Module_Foo' => '', 'Module_Bar' => ''], [], true);
+        $expect = [
+            'Cannot enable Module_Foo',
+            'Cannot enable Module_Bar',
+            'Cannot enable Module_Foo, conflicting with other modules:',
+            "Module_Bar",
+            'Cannot enable Module_Bar, conflicting with other modules:',
+            "Module_Foo",
+        ];
+        $this->assertEquals($expect, $result);
+    }
+
     public function testCheckConstraintsDisableAllowed()
     {
         $this->dependencyChecker->expects($this->once())

dev/tests/unit/testsuite/Magento/Framework/Module/ConflictCheckerTest.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Setup\Controller;
 
+use Magento\Framework\Module\DbVersionInfo;
 use Magento\Setup\Model\UserConfigurationDataMapper as UserConfig;
 
 class ConsoleControllerTest extends \PHPUnit_Framework_TestCase
@@ -83,16 +84,15 @@ public function setUp()
         $this->mvcEvent->expects($this->any())->method('getRouteMatch')->willReturn($routeMatch);
 
         $this->objectManager = $this->getMockForAbstractClass('Magento\Framework\ObjectManagerInterface');
-        $objectManagerFactory = $this->getMock('Magento\Setup\Model\ObjectManagerFactory', [], [], '', false);
-        $objectManagerFactory->expects($this->any())->method('create')->willReturn($this->objectManager);
+        $objectManagerProvider = $this->getMock('Magento\Setup\Model\ObjectManagerProvider', [], [], '', false);
+        $objectManagerProvider->expects($this->any())->method('get')->willReturn($this->objectManager);
 
         $this->controller = new ConsoleController(
             $this->consoleLogger,
             $this->options,
             $installerFactory,
             $this->maintenanceMode,
-            $objectManagerFactory,
-            $objectManagerFactory
+            $objectManagerProvider
         );
         $this->controller->setEvent($this->mvcEvent);
         $this->controller->dispatch($this->request, $response);
@@ -168,6 +168,80 @@ public function testUpdateAction()
         $this->controller->updateAction();
     }
 
+    /**
+     * @param array $outdated
+     * @param array $expected
+     *
+     * @dataProvider dbStatusActionDataProvider
+     */
+    public function testDbStatusAction(array $outdated, array $expected)
+    {
+        $dbVersionInfo = $this->getMock('\Magento\Framework\Module\DbVersionInfo', [], [], '', false);
+        $this->objectManager->expects($this->once())
+            ->method('get')
+            ->with('Magento\Framework\Module\DbVersionInfo')
+            ->will($this->returnValue($dbVersionInfo));
+        $dbVersionInfo->expects($this->once())
+            ->method('getDbVersionErrors')
+            ->will($this->returnValue($outdated));
+        foreach ($expected as $at => $message) {
+            $this->consoleLogger->expects($this->at($at))
+                ->method('log')
+                ->with($this->matches($message));
+        }
+        $this->controller->dbStatusAction();
+    }
+
+    /**
+     * @return array
+     */
+    public function dbStatusActionDataProvider()
+    {
+        return [
+            'one outdated module' => [
+                [[
+                    DbVersionInfo::KEY_MODULE => 'Module_One',
+                    DbVersionInfo::KEY_TYPE => 'schema',
+                    DbVersionInfo::KEY_CURRENT => '1.0.0',
+                    DbVersionInfo::KEY_REQUIRED => '1.0.1',
+                ]],
+                [
+                    1 => '%wModule_One%wschema:%w1.0.0%w->%w1.0.1%w',
+                    2 => 'Run the "Update" command to update your DB schema and data'
+                ],
+            ],
+            'no outdated modules' => [
+                [],
+                [0 => 'All modules are up to date'],
+            ],
+            'one newer module' => [
+                [[
+                    DbVersionInfo::KEY_MODULE => 'Module_One',
+                    DbVersionInfo::KEY_TYPE => 'schema',
+                    DbVersionInfo::KEY_CURRENT => '1.0.1',
+                    DbVersionInfo::KEY_REQUIRED => '1.0.0',
+                ]],
+                [
+                    1 => '%wModule_One%wschema:%w1.0.1%w->%w1.0.0%w',
+                    2 => 'Some modules use code versions newer or older than the database. ' .
+                        'First update the module code, then run the "Update" command.'
+                ],
+            ],
+            'one none module' => [
+                [[
+                    DbVersionInfo::KEY_MODULE => 'Module_One',
+                    DbVersionInfo::KEY_TYPE => 'schema',
+                    DbVersionInfo::KEY_CURRENT => 'none',
+                    DbVersionInfo::KEY_REQUIRED => '1.0.0',
+                ]],
+                [
+                    1 => '%wModule_One%wschema:%wnone%w->%w1.0.0%w',
+                    2 => 'Run the "Update" command to update your DB schema and data'
+                ],
+            ]
+        ];
+    }
+
     public function testInstallUserConfigAction()
     {
         $this->installer->expects($this->once())->method('installUserConfig')->with($this->parameters);