Fix execution of Boolean Condition fields

apollographql · Sep 21, 2021 · 1aed6ad · 1aed6ad
1 parent ed20344
commit 1aed6ad
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/Sources/Apollo/GraphQLExecutor.swift b/Sources/Apollo/GraphQLExecutor.swift
@@ -257,10 +257,18 @@ final class GraphQLExecutor {
         groupedFields.append(field: field, withInfo: info)
 
       case let .booleanCondition(booleanCondition):
-        guard let value = info.variables?[booleanCondition.variableName] else {
+        #warning("""
+          TODO: Make sure there are unit tests for this.
+          1) Include with variable true
+          2) Include with variable false
+          3) Skip with variable true
+          4) Skip with variable false
+          """)
+        guard case let .scalar(boolValue as Bool) =
+                info.variables?[booleanCondition.variableName] else {
           throw GraphQLError("Variable \(booleanCondition.variableName) was not provided.")
         }
-        if value as? Bool == !booleanCondition.inverted {
+        if boolValue == !booleanCondition.inverted {
           try groupFields(booleanCondition.selections,
                           forRuntimeType: runtimeType,
                           into: &groupedFields,

diff --git a/Sources/ApolloTestSupport/MockOperation.swift b/Sources/ApolloTestSupport/MockOperation.swift
@@ -70,32 +70,20 @@ open class AbstractMockSelectionSet: AnySelectionSet {
     self.data = data
   }
 
-  public subscript<T: ScalarType>(dynamicMember key: String) -> T? {
-    data.data[key] as? T
+  public subscript<T: AnyScalarType>(dynamicMember key: String) -> T? {
+    data[key]
   }
 
-  public subscript<T: CustomScalarType>(dynamicMember key: String) -> T? {
-    data.data[key] as? T
+  public subscript<T: AnyScalarType>(dynamicMember key: String) -> [T]? {
+    data[key]
   }
 
-  public subscript<T: ScalarType>(dynamicMember key: String) -> [T]? {
-    data.data[key] as? [T]
-  }
-
-  public subscript<T: CustomScalarType>(dynamicMember key: String) -> [T]? {
-    data.data[key] as? [T]
-  }
-
-  public subscript<T: ScalarType>(dynamicMember key: String) -> [[T]]? {
-    data.data[key] as? [[T]]
-  }
-
-  public subscript<T: CustomScalarType>(dynamicMember key: String) -> [[T]]? {
-    data.data[key] as? [[T]]
+  public subscript<T: AnyScalarType>(dynamicMember key: String) -> [[T]]? {
+    data[key]
   }
 
   public subscript<T: MockSelectionSet>(dynamicMember key: String) -> T? {
-    data.data[key] as? T
+    data[key]
   }
 }