Fix merge conflict

atlassian-labs · May 15, 2024 · f5ba103 · f5ba103
1 parent 4a51945
commit f5ba103
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/NadelIntegrationTest.kt b/test/src/test/kotlin/graphql/nadel/tests/next/NadelIntegrationTest.kt
@@ -32,6 +32,7 @@ import graphql.schema.idl.SchemaGenerator
 import graphql.schema.idl.SchemaParser
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.future.await
 import kotlinx.coroutines.reactive.asFlow
 import kotlinx.coroutines.test.runTest
 import org.intellij.lang.annotations.Language
@@ -64,7 +65,7 @@ abstract class NadelIntegrationTest(
         val executionInput = makeExecutionInput().build()
 
         // When
-        val result = nadel.execute(executionInput)
+        val result = nadel.execute(executionInput).await()
 
         val incrementalResults = if (result is IncrementalExecutionResult) {
             result.incrementalItemPublisher
@@ -88,7 +89,7 @@ abstract class NadelIntegrationTest(
         val result = nadel
             .execute(makeExecutionInput().build())
             .let {
-                executionCapture.capture(it)
+                executionCapture.capture(it.await())
             }
 
         if (result is IncrementalExecutionResult) {
@@ -360,11 +361,13 @@ abstract class NadelIntegrationTest(
         )
 
         // When
-        val noDeferResult = nadel.execute(
-            executionInput.copy(
-                query = stripDefer(executionInput.query),
-            ),
-        )
+        val noDeferResult = nadel
+            .execute(
+                executionInput.copy(
+                    query = stripDefer(executionInput.query),
+                ),
+            )
+            .await()
 
         // Then
         assertTrue(noDeferResult !is IncrementalExecutionResult)