Fix tests merge conflict (#665)

atlassian-labs · Jan 8, 2025 · 0a5d283 · 0a5d283
1 parent b5800a0
commit 0a5d283
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/...legacy/new hydration/batching/batching conditional hydration in abstract type snapshot.kt b/...legacy/new hydration/batching/batching conditional hydration in abstract type snapshot.kt
@@ -33,6 +33,7 @@ public class `batching conditional hydration in abstract type snapshot` : TestSn
                 |     }
                 |     ... on SingleActivity {
                 |       batch_hydration__content__contentId: contentId
+                |       batch_hydration__content__contentId: contentId
                 |     }
                 |   }
                 | }

diff --git a/...el/tests/legacy/new hydration/batching/batching conditional hydration in abstract type.kt b/...el/tests/legacy/new hydration/batching/batching conditional hydration in abstract type.kt
@@ -62,6 +62,13 @@ class `batching conditional hydration in abstract type` : NadelLegacyIntegration
                       {name: "ids" value: "${'$'}source.contentId"}
                     ]
                   )
+                  @hydrated(
+                    service: "monolith"
+                    field: "commentsByIds"
+                    arguments: [
+                      {name: "ids" value: "$source.contentId"}
+                    ]
+                  )
                 }
                 type Issue {
                   id: ID!
-Original file line number
+Diff line change
@@ Expand Up @@
                     |     }
                     |     ... on SingleActivity {
                     |       batch_hydration__content__contentId: contentId
+                    |       batch_hydration__content__contentId: contentId
                     |     }
                     |   }
                     | }
@@ Expand Down @@