Merge remote-tracking branch 'origin/develop' into MAGETWO-60598

Author: adifucan

app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml

@@ -31,7 +31,7 @@
         <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="sales_order_grid_data_source">
             <settings>
                 <requestFieldName>id</requestFieldName>
-                <primaryFieldName>entity_id</primaryFieldName>
+                <primaryFieldName>main_table.entity_id</primaryFieldName>
             </settings>
         </dataProvider>
     </dataSource>

dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php

@@ -26,13 +26,14 @@ class AssertCustomerForm extends AbstractConstraint
      *
      * @var array
      */
-    protected $customerSkippedFields = [
+    private $customerSkippedFields = [
         'id',
         'password',
         'password_confirmation',
         'current_password',
         'is_subscribed',
-        'address'
+        'address',
+        'group_id'
     ];
 
     /**
@@ -71,6 +72,7 @@ public function processAssert(
             'Customer data on edit page(backend) not equals to passed from fixture.'
             . "\nFailed values: " . implode(', ', $dataDiff)
         );
+        $this->assertCustomerGroupName($customer, $dataForm);
     }
 
     /**
@@ -80,7 +82,7 @@ public function processAssert(
      * @param array $dataForm
      * @return array
      */
-    protected function verify(array $dataFixture, array $dataForm)
+    private function verify(array $dataFixture, array $dataForm)
     {
         $result = [];
 
@@ -110,6 +112,33 @@ protected function verify(array $dataFixture, array $dataForm)
         return $result;
     }
 
+    /**
+     * Check is Customer Group name correct.
+     *
+     * @param Customer $customer
+     * @param array $formData
+     * @return void
+     */
+    private function assertCustomerGroupName(Customer $customer, array $formData)
+    {
+        $customerGroupName = $customer->getGroupId();
+
+        if ($customerGroupName) {
+            \PHPUnit_Framework_Assert::assertNotEmpty(
+                $formData['customer']['group_id'],
+                'Customer Group value is empty.'
+            );
+
+            if (!empty($formData['customer']['group_id'])) {
+                \PHPUnit_Framework_Assert::assertContains(
+                    $customerGroupName,
+                    $formData['customer']['group_id'],
+                    'Customer Group name is incorrect.'
+                );
+            }
+        }
+    }
+
     /**
      * Text success verify Customer form.
      *

dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php

@@ -35,15 +35,17 @@ class AssertCartPriceRuleForm extends AbstractConstraint
      * @param PromoQuoteEdit $promoQuoteEdit
      * @param FixtureFactory $fixtureFactory
      * @param SalesRule $salesRule
-     * @param SalesRule $salesRuleOrigin
+     * @param SalesRule $salesRuleOrigin [optional]
+     * @param SalesRule $salesRuleAdditional [optional]
      * @return void
      */
     public function processAssert(
         PromoQuoteIndex $promoQuoteIndex,
         PromoQuoteEdit $promoQuoteEdit,
         FixtureFactory $fixtureFactory,
         SalesRule $salesRule,
-        SalesRule $salesRuleOrigin = null
+        SalesRule $salesRuleOrigin = null,
+        SalesRule $salesRuleAdditional = null
     ) {
         $filter = [
             'name' => $salesRule->hasData('name') ? $salesRule->getName() : $salesRuleOrigin->getName(),
@@ -59,6 +61,9 @@ public function processAssert(
         $fixtureData = $salesRuleOrigin != null
             ? array_merge($salesRuleOrigin->getData(), $salesRule->getData())
             : $salesRule->getData();
+        if ($salesRuleAdditional) {
+            $fixtureData = array_merge($fixtureData, $salesRuleAdditional->getData());
+        }
         $dataDiff = $this->verify($fixtureData, $formData);
         \PHPUnit_Framework_Assert::assertTrue(
             empty($dataDiff),