Merge remote-tracking branch 'origin/develop' into UI

Natalia Momotenko · Natalia Momotenko · commit f5b1626099b8 · 2015-03-20T17:00:52.000+02:00
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php
@@ -11,20 +11,20 @@
 class Upload extends \Magento\Backend\App\Action
 {
     /**
-     * @var \Magento\Framework\Controller\Result\JsonFactory
+     * @var \Magento\Framework\Controller\Result\RawFactory
      */
-    protected $resultJsonFactory;
+    protected $resultRawFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
     ) {
         parent::__construct($context);
-        $this->resultJsonFactory = $resultJsonFactory;
+        $this->resultRawFactory = $resultRawFactory;
     }
 
     /**
@@ -36,7 +36,7 @@ protected function _isAllowed()
     }
 
     /**
-     * @return \Magento\Framework\Controller\Result\Json
+     * @return \Magento\Framework\Controller\Result\Raw
      */
     public function execute()
     {
@@ -72,6 +72,10 @@ public function execute()
             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
         }
 
-        return $this->resultJsonFactory->create()->setData($result);
+        /** @var \Magento\Framework\Controller\Result\Raw $response */
+        $response = $this->resultRawFactory->create();
+        $response->setHeader('Content-type', 'text/plain');
+        $response->setContents(json_encode($result));
+        return $response;
     }
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php
@@ -90,7 +90,7 @@ public function execute()
             if ($storeId) {
                 $product->setStoreId($storeId);
             }
-            $setId = $this->getRequest()->getPost('set');
+            $setId = $this->getRequest()->getPost('set') ?: $this->getRequest()->getParam('set');
             if ($setId) {
                 $product->setAttributeSetId($setId);
             }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ValidateTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ValidateTest.php
@@ -28,9 +28,9 @@ class ValidateTest extends \Magento\Catalog\Test\Unit\Controller\Adminhtml\Produ
     protected $initializationHelper;
     /** @var \Magento\Catalog\Model\ProductFactory|\PHPUnit_Framework_MockObject_MockObject */
     protected $productFactory;
-    /** @var \Magento\Framework\Controller\Result\JSON|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Controller\Result\Json|\PHPUnit_Framework_MockObject_MockObject */
     protected $resultJson;
-    /** @var \Magento\Framework\Controller\Result\JSONFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Controller\Result\JsonFactory|\PHPUnit_Framework_MockObject_MockObject */
     protected $resultJsonFactory;
 
     protected function setUp()
@@ -104,8 +104,8 @@ protected function setUp()
             ->getMock();
         $this->productFactory->expects($this->any())->method('create')->willReturn($this->product);
 
-        $this->resultJson = $this->getMock('Magento\Framework\Controller\Result\JSON', [], [], '', false);
-        $this->resultJsonFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\JSONFactory')
+        $this->resultJson = $this->getMock('Magento\Framework\Controller\Result\Json', [], [], '', false);
+        $this->resultJsonFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\JsonFactory')
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -126,15 +126,21 @@ protected function setUp()
         );
     }
 
-    /**
-     * @return void
-     */
-    public function testAttributeSetIsObtainedFromPost()
+    public function testAttributeSetIsObtainedFromPostByDefault()
     {
+        $this->request->expects($this->any())->method('getParam')->willReturnMap([['set', null, 4]]);
         $this->request->expects($this->any())->method('getPost')->willReturnMap([['set', null, 9]]);
-
         $this->product->expects($this->once())->method('setAttributeSetId')->with(9);
 
         $this->action->execute();
     }
+
+    public function testAttributeSetIsObtainedFromGetWhenThereIsNoOneInPost()
+    {
+        $this->request->expects($this->any())->method('getParam')->willReturnMap([['set', null, 4]]);
+        $this->request->expects($this->any())->method('getPost')->willReturnMap([['set', null, null]]);
+        $this->product->expects($this->once())->method('setAttributeSetId')->with(4);
+
+        $this->action->execute();
+    }
 }
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
@@ -10,7 +10,9 @@
 
 <?php $_divId = 'tree-div_' . time() ?>
 <div id="<?php echo $_divId ?>" class="tree"></div>
-
+<!--[if IE]>
+<script id="ie-deferred-loader" defer="defer" src=""></script>
+<![endif]-->
 <script>
     require([
         'jquery',
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
@@ -35,7 +35,9 @@
        <div><?php echo __('This operation can take much time'); ?></div>
     </div>
 </div>
-
+<!--[if IE]>
+<script id="ie-deferred-loader" defer="defer" src=""></script>
+<![endif]-->
 <script>
 var tree;
 require([
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
@@ -10,7 +10,9 @@
 
 <?php $_divId = 'tree' . $block->getId() ?>
 <div id="<?php echo $_divId ?>" class="tree"></div>
-
+<!--[if IE]>
+<script id="ie-deferred-loader" defer="defer" src=""></script>
+<![endif]-->
 <script>
 require(['jquery', "prototype", "extjs/ext-tree-checkbox"], function(jQuery){
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
@@ -38,8 +38,11 @@ require([
             <span class="title"><?php echo __('Unassigned Attributes') ?></span>
         </div>
         <div id="tree-div2" class="attribute-set-tree"></div>
+        <!--[if IE]>
+        <script id="ie-deferred-loader" defer="defer" src=""></script>
+        <![endif]-->
             <script>
-require(["jquery", "extjs/ext-tree-checkbox", "prototype"], function(jQuery){
+define("tree-panel", ["jquery", "extjs/ext-tree-checkbox", "prototype"], function(jQuery){
 
             //<![CDATA[
             var allowDragAndDrop = <?php echo($block->getIsReadOnly() ? 'false' : 'true'); ?>;
@@ -406,6 +409,7 @@ require(["jquery", "extjs/ext-tree-checkbox", "prototype"], function(jQuery){
             //]]>
 
 });
+require(["tree-panel"]);
 </script>
     </div>
 </div>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml
@@ -9,7 +9,7 @@
 
 ?>
 <script>
-require(['jquery'], function(){
+require(["tree-panel"], function(){
 ConfigurableNodeExists = function(currentNode) {
     for (var i in currentNode.childNodes ) {
         if (currentNode.childNodes[i].id) {
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/files/tree.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/files/tree.phtml
@@ -28,7 +28,9 @@
 </div>
 
 <div id="tree" style="width:100%; overflow:auto;"></div>
-
+<!--[if IE]>
+<script id="ie-deferred-loader" defer="defer" src=""></script>
+<![endif]-->
 <script>
 require([
     'jquery',
diff --git a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
@@ -15,6 +15,9 @@
         <div class="actions"><?php echo $block->getAddLayoutButtonHtml() ?></div>
     </div>
 </fieldset>
+<!--[if IE]>
+<script id="ie-deferred-loader" defer="defer" src=""></script>
+<![endif]-->
 <script>
 require([
     'jquery',
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "magento/mtf": "1.0.0-rc19",
+        "magento/mtf": "1.0.0-rc20",
         "php": "~5.5.0|~5.6.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2",
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php
@@ -6,15 +6,15 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Attribute;
 
-use Magento\Backend\Test\Block\Widget\Tab;
 use Magento\Backend\Test\Block\Widget\FormTabs;
+use Magento\Backend\Test\Block\Widget\Tab;
+use Magento\Mtf\Block\BlockFactory;
+use Magento\Mtf\Block\Mapper;
 use Magento\Mtf\Client\BrowserInterface;
-use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Mtf\Client\Element;
+use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Fixture\FixtureInterface;
-use Magento\Mtf\Block\BlockFactory;
-use Magento\Mtf\Block\Mapper;
 use Magento\Mtf\Util\XmlConverter;
 
 /**
@@ -64,14 +64,6 @@ public function __construct(
         $this->browser->switchToFrame(new Locator($this->iFrame));
     }
 
-    /**
-     * @destructor
-     */
-    public function __destruct()
-    {
-        $this->browser->switchToFrame();
-    }
-
     /**
      * Fill the attribute form.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php
@@ -150,7 +150,7 @@ protected function verifySku()
         $fixtureProductSku = $this->product->getSku();
         $formProductSku = $this->productView->getProductSku();
 
-        if ($fixtureProductSku == $formProductSku) {
+        if ($fixtureProductSku === null || $fixtureProductSku == $formProductSku) {
             return null;
         }
         return "Displayed product sku on product page(front-end) not equals passed from fixture. "
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
@@ -6,10 +6,11 @@
 
 namespace Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config;
 
-use Magento\Mtf\Client\Locator;
 use Magento\Backend\Test\Block\Widget\Form;
-use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\ConfigurableProduct\Test\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute\AttributeSelector;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\ObjectManager;
 
 /**
  * Attribute block in Variation section.
@@ -158,13 +159,17 @@ public function fillAttributes(array $attributes)
      */
     protected function createNewVariationSet(array $attribute)
     {
-        $this->_rootElement->find($this->createNewVariationSet)->click();
+        $attributeFixture = ObjectManager::getInstance()->create(
+            'Magento\Catalog\Test\Fixture\CatalogProductAttribute',
+            ['data' => $attribute]
+        );
 
+        $this->_rootElement->find($this->createNewVariationSet)->click();
         $newAttribute = $this->getEditAttributeForm();
-        $newAttribute->getTabElement('properties')->fillFormTab($attribute);
+        $newAttribute->fill($attributeFixture);
         $newAttribute->_rootElement->find($this->saveAttribute)->click();
 
-        $this->browser->selectWindow();
+        $this->browser->switchToFrame();
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.php
@@ -40,7 +40,7 @@ class CreateConfigurableProductEntityTest extends Injectable
 {
     /* tags */
     const TEST_TYPE = 'acceptance_test';
-    const STABLE = 'no';
+    const STABLE = 'yes';
     const MVP = 'yes';
     const DOMAIN = 'MX';
     /* end tags */
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml
@@ -9,7 +9,6 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\ConfigurableProduct\Test\TestCase\CreateConfigurableProductEntityTest">
         <variation name="CreateConfigurableProductEntityTestVariation1">
-            <data name="issue" xsi:type="string">Bug: MAGETWO-34195</data>
             <data name="description" xsi:type="string">Create product with category and two new options</data>
             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
             <data name="product/data/configurable_attributes_data/preset" xsi:type="string">two_new_options</data>
@@ -55,7 +54,6 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductInCart"/>
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation3">
-            <data name="issue" xsi:type="string">Bug: MAGETWO-34195</data>
             <data name="description" xsi:type="string">Create product with special price</data>
             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
             <data name="product/data/configurable_attributes_data/preset" xsi:type="string">two_new_options</data>
@@ -116,13 +114,13 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductPage" />
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation6" firstConstraint="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" method="test">
-            <data name="issue" xsi:type="string">Bug: MAGETWO-34195</data>
             <data name="description" xsi:type="string">MAGETWO-13361: Create Configurable Product with Creating New Category and New Attribute (Required Fields Only)</data>
             <data name="product/data/configurable_attributes_data/preset" xsi:type="string">two_searchable_options</data>
             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
             <data name="product/data/price/value" xsi:type="string">100</data>
             <data name="product/data/category_ids/new_category" xsi:type="string">no</data>
             <data name="product/data/category_ids/presets" xsi:type="string">default_subcategory</data>
+            <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
             <data name="product/data/affected_attribute_set" xsi:type="string">custom_attribute_set_%isolation%</data>
             <data name="tag" xsi:type="string">test_type:acceptance_test</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/Role/Curl.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/Role/Curl.php
@@ -61,7 +61,7 @@ public function persist(FixtureInterface $fixture = null)
         }
 
         $url = 'admin/user_role/roleGrid/sort/role_id/dir/desc/';
-        $regExpPattern = '/col\-role_id\W*(\d+)<.td><[^<>]*?>' . $data['rolename'] . '/siu';
+        $regExpPattern = '/col\-role_id[\s\W]*(\d+)\s*<.td>\s*<[^<>]*?>' . $data['rolename'] . '/siu';
 
         $extractor = new Extractor($url, $regExpPattern);
 
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/Curl.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/Curl.php
@@ -47,7 +47,7 @@ public function persist(FixtureInterface $fixture = null)
         }
 
         $url = 'admin/user/roleGrid/sort/user_id/dir/desc';
-        $regExpPattern = '/col-user_id\W*(\d+)<.td><[^<>]*?>' . $data['username'] . '/siu';
+        $regExpPattern = '/col-user_id[\s\W]*(\d+)\s*<.td>\s*<[^<>]*?>' . $data['username'] . '/siu';
         $extractor = new Extractor($url, $regExpPattern);
 
         return ['user_id' => $extractor->getData()[1]];
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
@@ -197,7 +197,11 @@ public function formatDate($date = null, $format = \IntlDateFormatter::SHORT, $s
     public function scopeTimeStamp($scope = null)
     {
         $timezone = $this->_scopeConfig->getValue($this->getDefaultTimezonePath(), $this->_scopeType, $scope);
-        return (new \DateTime('now', new \DateTimeZone($timezone ?: 'UTC')))->getTimestamp();
+        $currentTimezone = @date_default_timezone_get();
+        @date_default_timezone_set($timezone);
+        $date = date('Y-m-d H:i:s');
+        @date_default_timezone_set($currentTimezone);
+        return strtotime($date);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php
@@ -99,10 +99,7 @@ public function getListToMove()
      */
     public function getListToRemove()
     {
-        return array_keys(array_intersect_key(
-            $this->_scheduledElements,
-            array_merge($this->_scheduledRemoves, $this->_brokenParent)
-        ));
+        return array_keys(array_intersect_key($this->_scheduledElements, $this->_scheduledRemoves));
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
@@ -116,7 +116,7 @@ public function minify($file)
             '#(?<!]]>)\s+</#',
             '</',
             preg_replace(
-                '#((?:<\?php\s+(?!echo|print)[^\?]*)\?>)\s+#',
+                '#((?:<\?php\s+(?!echo|print|if|elseif|else)[^\?]*)\?>)\s+#',
                 '$1',
                 preg_replace(
                     '#(?<!' . implode('|', $this->inlineHtmlTags) . ')\> \<#',
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructureTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructureTest.php
@@ -393,7 +393,7 @@ public function testSetElementToBrokenParentList()
     {
         $element = 'element9';
         $expectedToRemove = ['element2', 'element3'];
-        $expectedToRemoveWithBroken = ['element2', 'element3', $element];
+        $expectedToRemoveWithBroken = ['element2', 'element3'];
         $this->assertEquals($expectedToRemove, $this->_model->getListToRemove());
 
         $this->_model->setElementToBrokenParentList($element);

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public function execute()`
`90`	`90`	`if ($storeId) {`
`91`	`91`	`$product->setStoreId($storeId);`
`92`	`92`	`}`
`93`		`- $setId = $this->getRequest()->getPost('set');`
	`93`	`+ $setId = $this->getRequest()->getPost('set') ?: $this->getRequest()->getParam('set');`
`94`	`94`	`if ($setId) {`
`95`	`95`	`$product->setAttributeSetId($setId);`
`96`	`96`	`}`