Ignore last argument of key directive

ChilliCream · Dec 13, 2023 · b808873 · b808873
1 parent 4d10e95
commit b808873
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/...HotChocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/KeyDirectiveTests.cs b/...HotChocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/KeyDirectiveTests.cs
@@ -26,8 +26,8 @@ public void AddKeyDirective_EnsureAvailableInSchema()
         Assert.NotNull(directive);
         Assert.IsType<KeyDirectiveType>(directive);
         Assert.Equal(WellKnownTypeNames.Key, directive!.Name);
-        Assert.Single(directive.Arguments);
-        AssertDirectiveHasFieldsArgument(directive);
+        Assert.Equal(2, directive.Arguments.Count);
+        AssertDirectiveHasFieldsArgument(directive.Arguments.Take(1));
         Assert.True(directive.Locations.HasFlag(DirectiveLocation.Object));
         Assert.True(directive.Locations.HasFlag(DirectiveLocation.Interface));
     }

diff --git a/...ocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/ProvidesDirectiveTests.cs b/...ocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/ProvidesDirectiveTests.cs
@@ -24,7 +24,7 @@ public void AddProvidesDirective_EnsureAvailableInSchema()
         Assert.IsType<ProvidesDirectiveType>(directive);
         Assert.Equal(WellKnownTypeNames.Provides, directive!.Name);
         Assert.Single(directive.Arguments);
-        AssertDirectiveHasFieldsArgument(directive);
+        AssertDirectiveHasFieldsArgument(directive.Arguments);
         Assert.Equal(DirectiveLocation.FieldDefinition, directive.Locations);
     }
 

diff --git a/...ocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/RequiresDirectiveTests.cs b/...ocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/RequiresDirectiveTests.cs
@@ -24,7 +24,7 @@ public void AddRequiresDirective_EnsureAvailableInSchema()
         Assert.IsType<RequiresDirectiveType>(directive);
         Assert.Equal(WellKnownTypeNames.Requires, directive!.Name);
         Assert.Single(directive.Arguments);
-        AssertDirectiveHasFieldsArgument(directive);
+        AssertDirectiveHasFieldsArgument(directive.Arguments);
         Assert.Equal(DirectiveLocation.FieldDefinition, directive.Locations);
     }
 

diff --git a/src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/FederationTypesTestBase.cs b/src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/FederationTypesTestBase.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using HotChocolate.Types;
 
 namespace HotChocolate.ApolloFederation;
@@ -21,10 +22,10 @@ protected ISchema CreateSchema(Action<ISchemaBuilder> configure)
         return builder.Create();
     }
 
-    protected void AssertDirectiveHasFieldsArgument(DirectiveType directive)
+    protected void AssertDirectiveHasFieldsArgument(IEnumerable<DirectiveArgument> directiveArguments)
     {
         Assert.Collection(
-            directive.Arguments,
+            directiveArguments,
             t =>
             {
                 Assert.Equal("fields", t.Name);