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