BUG#AC-6666:fixed failing static testcase

Author: Rachana

app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php

@@ -70,16 +70,52 @@ public function getQueryFields(FieldNode $fieldNode, ResolveInfo $resolveInfo):
             $selectedFields = [];
             $fragmentFields = [];
             /** @var FieldNode $field */
-            $response=$this->test($query, $resolveInfo);
-            $fragmentFields=$response['fragmentFields'];
-            $selectedFields=$response['selectedFields'];
+            foreach ($query as $field) {
+                if ($field->kind === NodeKind::INLINE_FRAGMENT) {
+                    $fragmentFields[] = $this->addInlineFragmentFields($resolveInfo, $field);
+                } elseif ($field->kind === NodeKind::FRAGMENT_SPREAD &&
+                    ($spreadFragmentNode = $resolveInfo->fragments[$field->name->value])) {
+
+                    foreach ($spreadFragmentNode->selectionSet->selections as $spreadNode) {
+                        $response= $this->setFieldNodeData($spreadNode, $resolveInfo);
+                        $fragmentFields=$response['fragmentFields'];
+                        $selectedFields=$response['selectedFields'];
+                    }
+                } else {
+                    $selectedFields[] = $field->name->value;
+                }
+            }
             if ($fragmentFields) {
                 $selectedFields = array_merge([], $selectedFields, ...$fragmentFields);
             }
-                    $this->setSelectionsForFieldNode($fieldNode, array_unique($selectedFields));
+            $this->setSelectionsForFieldNode($fieldNode, array_unique($selectedFields));
         }
 
-                return $this->getFieldNodeSelections($fieldNode);
+        return $this->getFieldNodeSelections($fieldNode);
+    }
+
+    /**
+     * Set the field selections for a query node
+     *
+     * @param array $spreadNode
+     * @param ResolveInfo $resolveInfo
+     */
+    public function setFieldNodeData($spreadNode, $resolveInfo)
+    {
+        $fragmentFields =[];
+        $selectedFields = [];
+        if (isset($spreadNode->selectionSet->selections)) {
+            if ($spreadNode->kind === NodeKind::FIELD && isset($spreadNode->name)) {
+                $selectedFields[] = $spreadNode->name->value;
+            }
+            $fragmentFields[] = $this->getQueryFields($spreadNode, $resolveInfo);
+        } else {
+            $selectedFields[] = $spreadNode->name->value;
+        }
+        $data=[];
+        $data['fragmentFields']=$fragmentFields;
+        $data['selectedFields']=$selectedFields;
+        return $data;
     }
 
     /**
@@ -113,6 +149,7 @@ private function addInlineFragmentFields(
         if ($fragmentFields) {
             $inlineFragmentFields = array_merge([], $inlineFragmentFields, ...$fragmentFields);
         }
+
         return array_unique($inlineFragmentFields);
     }
 
@@ -164,37 +201,4 @@ private function setSelectionsForFieldNode(FieldNode $fieldNode, array $selected
     {
         $this->queryFields[$fieldNode->name->value][$fieldNode->name->loc->start] = $selectedFields;
     }
-
-    /**
-     * Get array for fragment fields
-     *
-     * @param array $query
-     * @param ResolveInfo $resolveInfo
-     */
-    public function test($query, $resolveInfo)
-    {
-        $selectedFields = [];
-        $fragmentFields = [];
-        foreach ($query as $field) {
-            if ($field->kind === NodeKind::INLINE_FRAGMENT) {
-                $fragmentFields[] = $this->addInlineFragmentFields($resolveInfo, $field);
-            } elseif ($field->kind === NodeKind::FRAGMENT_SPREAD &&
-                ($spreadFragmentNode = $resolveInfo->fragments[$field->name->value])) {
-
-                foreach ($spreadFragmentNode->selectionSet->selections as $spreadNode) {
-                    if (isset($spreadNode->selectionSet->selections)) {
-                        $fragmentFields[] = $this->getQueryFields($spreadNode, $resolveInfo);
-                    } else {
-                        $selectedFields[] = $spreadNode->name->value;
-                    }
-                }
-            } else {
-                $selectedFields[] = $field->name->value;
-            }
-            $data=[];
-            $data['fragmentFields']=$fragmentFields;
-            $data['selectedFields']=$selectedFields;
-            return $data;
-        }
-    }
 }