Merge remote-tracking branch 'remotes/dev/1.10' into 1.10

oroinc · Nov 2, 2016 · f7093a4 · f7093a4
2 parents b4dbac6 + 8f2dcf9
commit f7093a4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/src/OroCRM/Bundle/MagentoBundle/Resources/config/datagrid.yml b/src/OroCRM/Bundle/MagentoBundle/Resources/config/datagrid.yml
@@ -89,8 +89,8 @@ datagrid:
                 createdAt:   { data_name: c.createdAt }
                 updatedAt:   { data_name: c.updatedAt }
                 countryName: { data_name: country.name }
+                regionName:  { data_name: region.name}
                 lifetime:    { data_name: c.lifetime }
-                regionName:  { data_name: address.regionName }
             default:
                 lastName:  ASC
                 firstName: ASC

diff --git a/src/OroCRM/Bundle/MagentoBundle/Tests/Functional/Controller/CartControllerTest.php b/src/OroCRM/Bundle/MagentoBundle/Tests/Functional/Controller/CartControllerTest.php
@@ -77,13 +77,17 @@ public function testView()
         );
     }
 
+    /**
+     * @return array
+     */
     public function gridProvider()
     {
         return [
             'Magento cart grid' => [
                 [
                     'gridParameters' => [
-                        'gridName' => 'magento-cart-grid'
+                        'gridName' => 'magento-cart-grid',
+                        'magento-cart-grid[_sort_by][originId]' => 'ASC',
                     ],
                     'gridFilters' => [],
                     'asserts' => [

diff --git a/src/OroCRM/Bundle/MagentoBundle/Tests/Functional/Controller/CustomerControllerTest.php b/src/OroCRM/Bundle/MagentoBundle/Tests/Functional/Controller/CustomerControllerTest.php
@@ -57,7 +57,7 @@ public function testGrid($requestData)
     }
 
     /**
-     * @depend1s testGrid
+     * @depends testGrid
      */
     public function testCreate()
     {

diff --git a/...M/Bundle/MagentoBundle/Tests/Functional/Controller/NewsletterSubscriberControllerTest.php b/...M/Bundle/MagentoBundle/Tests/Functional/Controller/NewsletterSubscriberControllerTest.php
@@ -93,16 +93,6 @@ public function testView()
         $this->assertContains($this->subscriber->getStatus()->getName(), $result->getContent());
     }
 
-    /**
-     * @param array $requestData
-     *
-     * @dataProvider gridProvider
-     */
-    public function testGrid($requestData)
-    {
-        parent::testGrid($requestData);
-    }
-
     /**
      * @return array
      */
@@ -111,7 +101,10 @@ public function gridProvider()
         return [
             'default' => [
                 [
-                    'gridParameters' => ['gridName' => 'magento-newsletter-subscriber-grid'],
+                    'gridParameters' => [
+                        'gridName' => 'magento-newsletter-subscriber-grid',
+                        'magento-newsletter-subscriber-grid[_sort_by][customerName]' => 'DESC',
+                    ],
                     'gridFilters' => [],
                     'assert' => [
                         'channelName' => 'Magento channel',

diff --git a/src/OroCRM/Bundle/MagentoBundle/Tests/Functional/Controller/OrderControllerTest.php b/src/OroCRM/Bundle/MagentoBundle/Tests/Functional/Controller/OrderControllerTest.php
@@ -52,13 +52,17 @@ public function testView()
         $this->assertContains('Shopping Cart', $result->getContent());
     }
 
+    /**
+     * @return array
+     */
     public function gridProvider()
     {
         return [
             'Magento order grid'                             => [
                 [
                     'gridParameters'      => [
-                        'gridName' => 'magento-order-grid'
+                        'gridName' => 'magento-order-grid',
+                        'magento-order-grid[_sort_by][incrementId]' => 'ASC',
                     ],
                     'gridFilters'         => [],
                     'asserts' => [
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,7 +57,7 @@ public function testGrid($requestData) @@
         }
         /**
-         * @depend1s testGrid
+         * @depends testGrid
          */
         public function testCreate()
         {
@@ Expand Down @@