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,7 +212,10 @@ private function addDefaultSortOrder(SearchCriteriaInterface $searchCriteria, ar
                 ->create();
         } else {
             $categoryIdFilter = isset($args['filter']['category_id']) ? $args['filter']['category_id'] : false;
-            if ($categoryIdFilter && count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1) {
+            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)

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

@@ -280,9 +280,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

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

@@ -441,7 +441,7 @@ public function testCategoryProducts()
         $this->assertArrayHasKey('products', $response['categories']['items'][0]);
         $baseCategory = $response['categories']['items'][0];
         $this->assertArrayHasKey('total_count', $baseCategory['products']);
-        //$this->assertGreaterThanOrEqual(1, $baseCategory['products']['total_count']);
+        $this->assertGreaterThanOrEqual(1, $baseCategory['products']['total_count']);
         $this->assertEquals(1, $baseCategory['products']['page_info']['current_page']);
         $this->assertEquals(20, $baseCategory['products']['page_info']['page_size']);
         $this->assertArrayHasKey('sku', $baseCategory['products']['items'][0]);

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

@@ -186,9 +186,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']
+            ['sku' => '12345', 'name' => 'Simple Product Two']
         ];
         $this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
         //Check base category children