Merge pull request #464 from magento-troll/troll-kanban

Ganin, Roman(rganin) · Ganin, Roman(rganin) · commit 25f34d690913 · 2016-03-19T14:54:31.000+02:00
[Troll &amp; Dragons] Bugfixes
diff --git a/app/code/Magento/Sales/Model/OrderRepository.php b/app/code/Magento/Sales/Model/OrderRepository.php
@@ -105,6 +105,7 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
                 $searchResult->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]);
             }
         }
+        $searchResult->setSearchCriteria($searchCriteria);
         $searchResult->setCurPage($searchCriteria->getCurrentPage());
         $searchResult->setPageSize($searchCriteria->getPageSize());
         foreach ($searchResult->getItems() as $order) {
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
@@ -49,6 +49,7 @@ public function testOrderList()
                 $filterBuilder
                     ->setField('status')
                     ->setValue('processing')
+                    ->setConditionType('eq')
                     ->create(),
             ]
         );
@@ -70,5 +71,7 @@ public function testOrderList()
         $result = $this->_webApiCall($serviceInfo, $requestData);
         $this->assertArrayHasKey('items', $result);
         $this->assertCount(1, $result['items']);
+        $this->assertArrayHasKey('search_criteria', $result);
+        $this->assertEquals($searchData, $result['search_criteria']);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/AdminNotification/Test/Block/System/Messages.php b/dev/tests/functional/tests/app/Magento/AdminNotification/Test/Block/System/Messages.php
@@ -18,7 +18,7 @@ class Messages extends Block
      *
      * @var string
      */
-    protected $closePopup = '.ui-dialog-titlebar-close';
+    protected $closePopup = '[data-role="closeBtn"]';
 
     /**
      * Close popup block.
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
@@ -14,7 +14,7 @@
         <block name="storeStatsBlock" class="Magento\Backend\Test\Block\Dashboard\StoreStats" locator=".dashboard-store-stats" strategy="css selector" />
         <block name="errorBlock" class="Magento\Backend\Test\Block\Page\Error" locator="[id='page:main-container']" strategy="css selector" />
         <block name="accessDeniedBlock" class="Magento\Backend\Test\Block\Denied" locator="#anchor-content" strategy="css selector" />
-        <block name="systemMessageDialog" class="Magento\AdminNotification\Test\Block\System\Messages" locator='[role="dialog"].ui-popup-message' strategy="css selector" />
+        <block name="systemMessageDialog" class="Magento\AdminNotification\Test\Block\System\Messages" locator='.ui-popup-message .modal-inner-wrap' strategy="css selector" />
         <block name="applicationVersion" class="Magento\Backend\Test\Block\Version" locator="body" strategy="css selector" />
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Page/Adminhtml/CatalogRuleIndex.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Page/Adminhtml/CatalogRuleIndex.xml
@@ -10,6 +10,6 @@
         <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector" />
         <block name="gridPageActions" class="Magento\CatalogRule\Test\Block\Adminhtml\Promo\GridPageActions" locator=".page-main-actions" strategy="css selector" />
         <block name="catalogRuleGrid" class="Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog" locator="#promo_catalog_grid" strategy="css selector" />
-        <block name="systemMessageDialog" class="Magento\AdminNotification\Test\Block\System\Messages" locator='[role="dialog"].ui-popup-message' strategy="css selector" />
+        <block name="systemMessageDialog" class="Magento\AdminNotification\Test\Block\System\Messages" locator='.ui-popup-message .modal-inner-wrap' strategy="css selector" />
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Page/Adminhtml/PromoQuoteIndex.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Page/Adminhtml/PromoQuoteIndex.xml
@@ -10,6 +10,6 @@
         <block name="promoQuoteGrid" class="Magento\SalesRule\Test\Block\Adminhtml\Promo\Grid" locator="#promo_quote_grid" strategy="css selector" />
         <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages" strategy="css selector" />
         <block name="gridPageActions" class="Magento\Backend\Test\Block\GridPageActions" locator=".page-main-actions" strategy="css selector" />
-        <block name="systemMessageDialog" class="Magento\AdminNotification\Test\Block\System\Messages" locator='[role="dialog"].ui-popup-message' strategy="css selector" />
+        <block name="systemMessageDialog" class="Magento\AdminNotification\Test\Block\System\Messages" locator='.ui-popup-message .modal-inner-wrap' strategy="css selector" />
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Page/Adminhtml/WidgetInstanceIndex.xml b/dev/tests/functional/tests/app/Magento/Widget/Test/Page/Adminhtml/WidgetInstanceIndex.xml
@@ -10,6 +10,6 @@
         <block name="pageActionsBlock" class="Magento\Backend\Test\Block\GridPageActions" locator=".page-main-actions" strategy="css selector" />
         <block name="widgetGrid" class="Magento\Widget\Test\Block\Adminhtml\Widget\WidgetGrid" locator="#widgetInstanceGrid" strategy="css selector" />
         <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages" strategy="css selector" />
-        <block name="systemMessageDialog" class="Magento\AdminNotification\Test\Block\System\Messages" locator='[role="dialog"].ui-popup-message' strategy="css selector" />
+        <block name="systemMessageDialog" class="Magento\AdminNotification\Test\Block\System\Messages" locator='.ui-popup-message .modal-inner-wrap' strategy="css selector" />
     </page>
 </config>
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -93,6 +93,8 @@ public function setArguments($arguments)
     protected function createObject($type, $args)
     {
         switch (count($args)) {
+            case 0:
+                return new $type();
             case 1:
                 return new $type($args[0]);
             case 2:
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -996,7 +996,7 @@ protected function getCacheTags()
         $tags[] = self::CACHE_GROUP;
 
         if ($this instanceof IdentityInterface) {
-            $tags += $this->getIdentities();
+            $tags = array_merge($tags, $this->getIdentities());
         }
         return $tags;
     }

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)`
`105`	`105`	`$searchResult->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]);`
`106`	`106`	`}`
`107`	`107`	`}`
	`108`	`+ $searchResult->setSearchCriteria($searchCriteria);`
`108`	`109`	`$searchResult->setCurPage($searchCriteria->getCurrentPage());`
`109`	`110`	`$searchResult->setPageSize($searchCriteria->getPageSize());`
`110`	`111`	`foreach ($searchResult->getItems() as $order) {`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ public function testOrderList()`
`49`	`49`	`$filterBuilder`
`50`	`50`	`->setField('status')`
`51`	`51`	`->setValue('processing')`
	`52`	`+ ->setConditionType('eq')`
`52`	`53`	`->create(),`
`53`	`54`	`]`
`54`	`55`	`);`
`@@ -70,5 +71,7 @@ public function testOrderList()`
`70`	`71`	`$result = $this->_webApiCall($serviceInfo, $requestData);`
`71`	`72`	`$this->assertArrayHasKey('items', $result);`
`72`	`73`	`$this->assertCount(1, $result['items']);`
	`74`	`+ $this->assertArrayHasKey('search_criteria', $result);`
	`75`	`+ $this->assertEquals($searchData, $result['search_criteria']);`
`73`	`76`	`}`
`74`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class Messages extends Block`
`18`	`18`	`*`
`19`	`19`	`* @var string`
`20`	`20`	`*/`
`21`		`- protected $closePopup = '.ui-dialog-titlebar-close';`
	`21`	`+ protected $closePopup = '[data-role="closeBtn"]';`
`22`	`22`
`23`	`23`	`/**`
`24`	`24`	`* Close popup block.`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,8 @@ public function setArguments($arguments)`
`93`	`93`	`protected function createObject($type, $args)`
`94`	`94`	`{`
`95`	`95`	`switch (count($args)) {`
	`96`	`+ case 0:`
	`97`	`+ return new $type();`
`96`	`98`	`case 1:`
`97`	`99`	`return new $type($args[0]);`
`98`	`100`	`case 2:`
Original file line number	Diff line number	Diff line change
`@@ -996,7 +996,7 @@ protected function getCacheTags()`
`996`	`996`	`$tags[] = self::CACHE_GROUP;`
`997`	`997`
`998`	`998`	`if ($this instanceof IdentityInterface) {`
`999`		`- $tags += $this->getIdentities();`
	`999`	`+ $tags = array_merge($tags, $this->getIdentities());`
`1000`	`1000`	`}`
`1001`	`1001`	`return $tags;`
`1002`	`1002`	`}`