Fixing fucntional tests after grid updates

Author: simpleadm

app/code/Magento/Customer/Model/ResourceModel/Group/Collection.php

@@ -12,6 +12,11 @@
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
+    /**
+     * @var string
+     */
+    protected $_idFieldName = 'customer_group_id';
+
     /**
      * Resource initialization
      *

app/code/Magento/Customer/etc/di.xml

@@ -439,7 +439,7 @@
             <argument name="mainTable" xsi:type="string">customer_group</argument>
             <argument name="eventPrefix" xsi:type="string">customer_group_grid_collection</argument>
             <argument name="eventObject" xsi:type="string">customer_group_collection</argument>
-            <argument name="resourceModel" xsi:type="string">Magento\Customer\Model\ResourceModel\Group\Collection</argument>
+            <argument name="resourceModel" xsi:type="string">Magento\Customer\Model\ResourceModel\Group</argument>
         </arguments>
     </type>
 </config>

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php

@@ -6,29 +6,44 @@
 
 namespace Magento\Customer\Test\Block\Adminhtml\Group;
 
-use Magento\Backend\Test\Block\Widget\Grid;
+use \Magento\Ui\Test\Block\Adminhtml\DataGrid;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class CustomerGroupGrid
  * Adminhtml customer group grid
  */
-class CustomerGroupGrid extends Grid
+class CustomerGroupGrid extends DataGrid
 {
+    /**
+     * Select action toggle.
+     *
+     * @var string
+     */
+    protected $selectAction = '.action-select';
+
     /**
      * Initialize block elements
      *
      * @var array $filters
      */
     protected $filters = [
         'code' => [
-            'selector' => '#customerGroupGrid_filter_type',
+            'selector' => '.admin__data-grid-filters input[name*=customer_group_code]',
         ],
     ];
 
     /**
-     * Locator value for grid to click
+     * Click on "Edit" link.
      *
-     * @var string
+     * @param SimpleElement $rowItem
+     * @return void
      */
-    protected $editLink = 'td[data-column="time"]';
+    protected function clickEditLink(SimpleElement $rowItem)
+    {
+        if ($rowItem->find($this->selectAction)->isVisible()) {
+            $rowItem->find($this->selectAction)->click();
+        }
+        $rowItem->find($this->editLink)->click();
+    }
 }

dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroup/Curl.php

@@ -9,6 +9,7 @@
 use Magento\Backend\Test\Handler\Extractor;
 use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\Util\Protocol\CurlInterface;
 use Magento\Mtf\Util\Protocol\CurlTransport;
 use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
@@ -59,11 +60,22 @@ public function persist(FixtureInterface $fixture = null)
      */
     public function getCustomerGroupId(array $data)
     {
-        $url = 'customer/group/index/sort/time/dir/desc';
-        $regExp = '/.*id\/(\d+)\/.*' . $data['code'] . '/siu';
-        $extractor = new Extractor($url, $regExp);
-        $match = $extractor->getData();
+        $url = $_ENV['app_backend_url'] . 'mui/index/render/';
+        $data = [
+            'namespace' => 'customer_group_listing',
+            'filters' => [
+                'placeholder' => true,
+                'customer_group_code' => $data['code']
+            ],
+            'isAjax' => true
+        ];
+        $curl = new BackendDecorator(new CurlTransport(), $this->_configuration);
+
+        $curl->write($url, $data, CurlInterface::POST);
+        $response = $curl->read();
+        $curl->close();
 
+        preg_match('/customer_group_listing_data_source.+items.+"customer_group_id":"(\d+)"/', $response, $match);
         return empty($match[1]) ? null : $match[1];
     }
 }

dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupIndex.xml

@@ -9,6 +9,6 @@
   <page name="CustomerGroupIndex" area="Adminhtml" mca="customer/group/index" module="Magento_Customer">
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
     <block name="gridPageActions" class="Magento\Backend\Test\Block\GridPageActions" locator=".page-main-actions" strategy="css selector"/>
-    <block name="customerGroupGrid" class="Magento\Customer\Test\Block\Adminhtml\Group\CustomerGroupGrid" locator="#customerGroupGrid" strategy="css selector"/>
+    <block name="customerGroupGrid" class="Magento\Customer\Test\Block\Adminhtml\Group\CustomerGroupGrid" locator="//div[contains(@data-bind, 'customer_group_listing')]" strategy="xpath"/>
   </page>
 </config>