Fix tests after NeverWiringFactory revert

atlassian-labs · Jan 2, 2025 · b7e6773 · b7e6773
1 parent a149b90
commit b7e6773
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 25 deletions.
diff --git a/test/src/test/kotlin/graphql/nadel/tests/hooks/scalar-transforms.kt b/test/src/test/kotlin/graphql/nadel/tests/hooks/scalar-transforms.kt
@@ -1,17 +1,14 @@
 package graphql.nadel.tests.hooks
 
-import graphql.nadel.Nadel
 import graphql.nadel.tests.EngineTestHook
 import graphql.nadel.tests.GatewaySchemaWiringFactory
 import graphql.nadel.tests.UseHook
+import graphql.schema.idl.WiringFactory
 import java.io.File
 
 interface GatewayScalarEngineHook : EngineTestHook {
-    override fun makeNadel(builder: Nadel.Builder): Nadel.Builder {
-        return super.makeNadel(builder)
-            .overallWiringFactory(GatewaySchemaWiringFactory())
-            .underlyingWiringFactory(GatewaySchemaWiringFactory())
-    }
+    override val wiringFactory: WiringFactory
+        get() = GatewaySchemaWiringFactory()
 }
 
 /**

diff --git a/test/src/test/kotlin/graphql/nadel/tests/legacy/scalars/date time scalar as input type.kt b/test/src/test/kotlin/graphql/nadel/tests/legacy/scalars/date time scalar as input type.kt
@@ -1,5 +1,7 @@
 package graphql.nadel.tests.legacy.scalars
 
+import graphql.nadel.NadelSchemas
+import graphql.nadel.tests.GatewaySchemaWiringFactory
 import graphql.nadel.tests.legacy.NadelLegacyIntegrationTest
 import graphql.scalars.ExtendedScalars
 import graphql.scalars.alias.AliasedScalar
@@ -58,6 +60,12 @@ class `date time scalar as input type` : NadelLegacyIntegrationTest(
         ),
     ),
 ) {
+    override fun makeNadelSchemas(): NadelSchemas.Builder {
+        return super.makeNadelSchemas()
+            .overallWiringFactory(GatewaySchemaWiringFactory())
+            .underlyingWiringFactory(GatewaySchemaWiringFactory())
+    }
+
     private data class Service_Foo(
         val thing: Any? = null,
     )

diff --git a/test/src/test/resources/fixtures/basic/service-types-are-completely-filtered.yml b/test/src/test/resources/fixtures/basic/service-types-are-completely-filtered.yml
@@ -142,7 +142,9 @@ response: |-
   {
     "data": {
       "test": {
-        "extensions": {}
+        "extensions": [
+          {}
+        ]
       }
     },
     "extensions": {}

diff --git a/test/src/test/resources/fixtures/deep renames/deep-rename-not-asked-for-with-unions.yml b/test/src/test/resources/fixtures/deep renames/deep-rename-not-asked-for-with-unions.yml
@@ -82,15 +82,12 @@ serviceCalls:
         "data": {
           "names": [
             {
-              "__typename": "Issue",
               "name": "GQLGW-001"
             },
             {
-              "__typename": "Issue",
               "name": "GQLGW-1102"
             },
             {
-              "__typename": "Edible",
               "name": "Spaghetti"
             }
           ]

diff --git a/test/src/test/resources/fixtures/deep renames/deep-rename-with-more-interfaces.yml b/test/src/test/resources/fixtures/deep renames/deep-rename-with-more-interfaces.yml
@@ -98,11 +98,9 @@ serviceCalls:
         "data": {
           "names": [
             {
-              "__typename": "Issue",
               "name": "GQLGW-001"
             },
             {
-              "__typename": "Issue",
               "name": "GQLGW-1102"
             },
             {
@@ -120,7 +118,6 @@ serviceCalls:
               }
             },
             {
-              "__typename": "Edible",
               "name": "Spaghetti"
             }
           ]

diff --git a/test/src/test/resources/fixtures/deep renames/deep-rename-with-more-unions.yml b/test/src/test/resources/fixtures/deep renames/deep-rename-with-more-unions.yml
@@ -102,11 +102,9 @@ serviceCalls:
         "data": {
           "names": [
             {
-              "__typename": "Issue",
               "name": "GQLGW-001"
             },
             {
-              "__typename": "Issue",
               "name": "GQLGW-1102"
             },
             {
@@ -124,7 +122,6 @@ serviceCalls:
               }
             },
             {
-              "__typename": "Edible",
               "name": "Spaghetti"
             }
           ]

diff --git a/test/src/test/resources/fixtures/deep renames/deep-rename-with-unions.yml b/test/src/test/resources/fixtures/deep renames/deep-rename-with-unions.yml
@@ -102,11 +102,9 @@ serviceCalls:
         "data": {
           "names": [
             {
-              "__typename" : "Issue",
               "name": "GQLGW-001"
             },
             {
-              "__typename" : "Issue",
               "name": "GQLGW-1102"
             },
             {
@@ -124,7 +122,6 @@ serviceCalls:
               }
             },
             {
-              "__typename" : "Edible",
               "name": "Spaghetti"
             }
           ]

diff --git a/.../test/resources/fixtures/polymorphism/lower-level-interface-fields-get-typename-added.yml b/.../test/resources/fixtures/polymorphism/lower-level-interface-fields-get-typename-added.yml
@@ -157,18 +157,14 @@ serviceCalls:
         "data": {
           "pets": [
             {
-              "__typename": "Dog",
               "name": "Sparky",
               "collar": {
-                "__typename": "DogCollar",
                 "color": "blue"
               }
             },
             {
-              "__typename": "Cat",
               "name": "Whiskers",
               "collar": {
-                "__typename": "CatCollar",
                 "color": "red"
               }
             }

diff --git a/...xtures/polymorphism/lower-level-interface-fields-which-are-renamed-get-typename-added.yml b/...xtures/polymorphism/lower-level-interface-fields-which-are-renamed-get-typename-added.yml
@@ -167,15 +167,13 @@ serviceCalls:
             {
               "name": "Sparky",
               "rename__collarToRenamed__collar": {
-                "__typename": "DogCollar",
                 "color": "blue"
               },
               "__typename__rename__collarToRenamed": "Dog"
             },
             {
               "name": "Whiskers",
               "rename__collarToRenamed__collar": {
-                "__typename": "CatCollar",
                 "color": "red"
               },
               "__typename__rename__collarToRenamed": "Cat"