Merge remote-tracking branch 'origin/MAGETWO-69621' into 2.1-develop-pr30

Author: DianaRusin

app/code/Magento/Catalog/Ui/DataProvider/Product/Attributes/Listing.php

@@ -41,14 +41,16 @@ public function __construct(
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
         $this->request = $request;
         $this->collection = $collectionFactory->create();
-        $this->collection->setExcludeSetFilter((int)$this->request->getParam('template_id', 0));
     }
 
     /**
      * {@inheritdoc}
      */
     public function getData()
     {
+        $this->collection->setExcludeSetFilter((int)$this->request->getParam('template_id', 0));
+        $this->collection->getSelect()->setPart('order', []);
+
         $items = [];
         foreach ($this->getCollection()->getItems() as $attribute) {
             $items[] = $attribute->toArray();

dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Attributes/ListingTest.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Ui\DataProvider\Product\Attributes;
+
+/**
+ * Test sorting in product attribute grid
+ */
+class ListingTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \Magento\Catalog\Ui\DataProvider\Product\Attributes\Listing */
+    private $dataProvider;
+
+    /** @var \Magento\Framework\App\RequestInterface */
+    private $request;
+
+    protected function setUp()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var \Magento\Framework\App\RequestInterface $request */
+        $this->request = $objectManager->get(\Magento\Framework\App\RequestInterface::class);
+
+        /** Default Attribute Set Id is equal 4 */
+        $this->request->setParams(['template_id' => 4]);
+
+        $this->dataProvider = $objectManager->create(
+            \Magento\Catalog\Ui\DataProvider\Product\Attributes\Listing::class,
+            [
+                'name' => 'product_attributes_grid_data_source',
+                'primaryFieldName' => 'attribute_id',
+                'requestFieldName' => 'id',
+                'request' => $this->request,
+            ]
+        );
+    }
+
+    public function testGetDataSortedAsc()
+    {
+        $this->dataProvider->addOrder('attribute_code', 'asc');
+        $data = $this->dataProvider->getData();
+        $this->assertEquals(2, $data['totalRecords']);
+        $this->assertEquals('color', $data['items'][0]['attribute_code']);
+        $this->assertEquals('manufacturer', $data['items'][1]['attribute_code']);
+    }
+
+    public function testGetDataSortedDesc()
+    {
+        $this->dataProvider->addOrder('attribute_code', 'desc');
+        $data = $this->dataProvider->getData();
+        $this->assertEquals(2, $data['totalRecords']);
+        $this->assertEquals('manufacturer', $data['items'][0]['attribute_code']);
+        $this->assertEquals('color', $data['items'][1]['attribute_code']);
+    }
+}