Updated the default sort to check if the category id is passed as an array.

Reverted the tests back to check on products

Author: dnyomo

app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php

@@ -212,14 +212,13 @@ private function addDefaultSortOrder(SearchCriteriaInterface $searchCriteria, ar
                 ->create();
         } else {
             $categoryIdFilter = isset($args['filter']['category_id']) ? $args['filter']['category_id'] : false;
-            if ($categoryIdFilter &&
-                !is_array($categoryIdFilter[array_key_first($categoryIdFilter)]) ||
-                count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1
-            ) {
-                $defaultSortOrder[] = $this->sortOrderBuilder
-                    ->setField(EavAttributeInterface::POSITION)
-                    ->setDirection(SortOrder::SORT_ASC)
-                    ->create();
+            if ($categoryIdFilter) {
+                if (!is_array($categoryIdFilter[array_key_first($categoryIdFilter)]) || count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1) {
+                    $defaultSortOrder[] = $this->sortOrderBuilder
+                        ->setField(EavAttributeInterface::POSITION)
+                        ->setDirection(SortOrder::SORT_ASC)
+                        ->create();
+                }
             }
         }
 

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoriesFilterTest.php

@@ -187,9 +187,9 @@ public function testQueryChildCategoriesWithProducts()
         $this->assertArrayHasKey('products', $baseCategory);
         //Check base category products
         $expectedBaseCategoryProducts = [
+            ['sku' => 'simple', 'name' => 'Simple Product'],
             ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
             ['sku' => '12345', 'name' => 'Simple Product Two'],
-            ['sku' => 'simple', 'name' => 'Simple Product']
         ];
         $this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
         //Check base category children
@@ -297,8 +297,8 @@ public function testQueryCategoryWithDisabledChildren()
         $this->assertEquals('Its a description of Test Category 1.2', $firstChildCategory['description']);
 
         $firstChildCategoryExpectedProducts = [
-            ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
-            ['sku' => 'simple', 'name' => 'Simple Product']
+            ['sku' => 'simple', 'name' => 'Simple Product'],
+            ['sku' => 'simple-4', 'name' => 'Simple Product Three']
         ];
         $this->assertCategoryProducts($firstChildCategory, $firstChildCategoryExpectedProducts);
         $firstChildCategoryChildren = [];

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php

@@ -453,7 +453,7 @@ public function testCategoryProducts()
         $this->assertAttributes($firstProduct);
         $this->assertWebsites($firstProductModel, $firstProduct['websites']);
         $this->assertEquals('Category 1', $firstProduct['categories'][0]['name']);
-        $this->assertEquals('movable-position-2', $firstProduct['categories'][1]['url_path']);
+        $this->assertEquals('category-1/category-1-1', $firstProduct['categories'][1]['url_path']);
         $this->assertCount(3, $firstProduct['categories']);
     }
 

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php

@@ -214,8 +214,8 @@ public function testQueryChildCategoriesWithProducts()
         $this->assertEquals('Category 1.2', $secondChildCategory['name']);
         $this->assertEquals('Its a description of Test Category 1.2', $secondChildCategory['description']);
         $firstChildCategoryExpectedProducts = [
-            ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
             ['sku' => 'simple', 'name' => 'Simple Product'],
+            ['sku' => 'simple-4', 'name' => 'Simple Product Three']
         ];
         $this->assertCategoryProducts($secondChildCategory, $firstChildCategoryExpectedProducts);
         $firstChildCategoryChildren = [];
@@ -277,9 +277,9 @@ public function testQueryCategoryWithDisabledChildren()
         $this->assertArrayHasKey('products', $baseCategory);
         //Check base category products
         $expectedBaseCategoryProducts = [
+            ['sku' => 'simple', 'name' => 'Simple Product'],
             ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
-            ['sku' => '12345', 'name' => 'Simple Product Two'],
-            ['sku' => 'simple', 'name' => 'Simple Product']
+            ['sku' => '12345', 'name' => 'Simple Product Two']
         ];
         $this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
         //Check base category children
@@ -294,8 +294,8 @@ public function testQueryCategoryWithDisabledChildren()
         $this->assertEquals('Its a description of Test Category 1.2', $firstChildCategory['description']);
 
         $firstChildCategoryExpectedProducts = [
-            ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
-            ['sku' => 'simple', 'name' => 'Simple Product']
+            ['sku' => 'simple', 'name' => 'Simple Product'],
+            ['sku' => 'simple-4', 'name' => 'Simple Product Three']
         ];
         $this->assertCategoryProducts($firstChildCategory, $firstChildCategoryExpectedProducts);
         $firstChildCategoryChildren = [];