Fixed Mutation Executor issue

ChilliCream · Oct 18, 2020 · f925bfe · f925bfe
1 parent 68a5a1f
commit f925bfe
Show file tree

Hide file tree

Showing 21 changed files with 69 additions and 30 deletions.
diff --git a/src/HotChocolate/Core/src/Execution/Processing/MutationExecutor.cs b/src/HotChocolate/Core/src/Execution/Processing/MutationExecutor.cs
@@ -48,6 +48,11 @@ internal sealed class MutationExecutor
                             scopedContext));
 
                     await ExecuteTasksAsync(operationContext).ConfigureAwait(false);
+
+                    if (i + 1 < selections.Count)
+                    {
+                        operationContext.Execution.Reset();
+                    }
                 }
             }
 

diff --git a/src/HotChocolate/Core/test/Execution.Tests/Integration/DataLoader/DataLoaderTests.cs b/src/HotChocolate/Core/test/Execution.Tests/Integration/DataLoader/DataLoaderTests.cs
@@ -2,17 +2,16 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using GreenDonut;
 using HotChocolate.DataLoader;
-using HotChocolate.Execution;
 using HotChocolate.Resolvers;
 using HotChocolate.Tests;
+using Microsoft.Extensions.DependencyInjection;
 using Snapshooter.Xunit;
 using Xunit;
 using static HotChocolate.Tests.TestHelper;
 
-namespace HotChocolate.Integration.DataLoader
+namespace HotChocolate.Execution.Integration.DataLoader
 {
     public class DataLoaderTests
     {

diff --git a/src/HotChocolate/Core/test/Execution.Tests/Integration/DataLoader/ITestDataLoader.cs b/src/HotChocolate/Core/test/Execution.Tests/Integration/DataLoader/ITestDataLoader.cs
@@ -1,6 +1,6 @@
 using GreenDonut;
 
-namespace HotChocolate.Integration.DataLoader
+namespace HotChocolate.Execution.Integration.DataLoader
 {
     public interface ITestDataLoader
         : IDataLoader<string, string>

diff --git a/src/HotChocolate/Core/test/Execution.Tests/Integration/DataLoader/MyCustomContext.cs b/src/HotChocolate/Core/test/Execution.Tests/Integration/DataLoader/MyCustomContext.cs
@@ -1,7 +1,7 @@
-namespace HotChocolate.Integration.DataLoader
+namespace HotChocolate.Execution.Integration.DataLoader
 {
     public class MyCustomContext
-    {
+    {
         public int Count { get; set; }
     }
 }
diff --git a/src/HotChocolate/Core/test/Execution.Tests/Integration/DataLoader/Query.cs b/src/HotChocolate/Core/test/Execution.Tests/Integration/DataLoader/Query.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using HotChocolate.Language;
 
-namespace HotChocolate.Integration.DataLoader
+namespace HotChocolate.Execution.Integration.DataLoader
 {
     public class Query
     {

diff --git a/src/HotChocolate/Core/test/Execution.Tests/Integration/DataLoader/TestDataLoader.cs b/src/HotChocolate/Core/test/Execution.Tests/Integration/DataLoader/TestDataLoader.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using GreenDonut;
 
-namespace HotChocolate.Integration.DataLoader
+namespace HotChocolate.Execution.Integration.DataLoader
 {
     public class TestDataLoader
         : DataLoaderBase<string, string>

diff --git a/src/HotChocolate/Core/test/Execution.Tests/Integration/Directives/ConstantDirectiveType.cs b/src/HotChocolate/Core/test/Execution.Tests/Integration/Directives/ConstantDirectiveType.cs
@@ -1,6 +1,6 @@
 using HotChocolate.Types;
 
-namespace HotChocolate.Integration.Directives
+namespace HotChocolate.Execution.Integration.Directives
 {
     public class ConstantDirectiveType
         : DirectiveType

diff --git a/...otChocolate/Core/test/Execution.Tests/Integration/Directives/DirectiveIntegrationTests.cs b/...otChocolate/Core/test/Execution.Tests/Integration/Directives/DirectiveIntegrationTests.cs
@@ -1,11 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using HotChocolate.Execution;
 using Snapshooter.Xunit;
 using Xunit;
 using static HotChocolate.Tests.TestHelper;
 
-namespace HotChocolate.Integration.Directives
+namespace HotChocolate.Execution.Integration.Directives
 {
     public class DirectiveIntegrationTests
     {

diff --git a/...hocolate/Core/test/Execution.Tests/Integration/EmbeddedResolvers/EmbeddedResolverTests.cs b/...hocolate/Core/test/Execution.Tests/Integration/EmbeddedResolvers/EmbeddedResolverTests.cs
@@ -1,12 +1,12 @@
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using HotChocolate.Tests;
 using HotChocolate.Types;
+using Microsoft.Extensions.DependencyInjection;
 using Snapshooter.Xunit;
 using Xunit;
 using static HotChocolate.Tests.TestHelper;
 
-namespace HotChocolate.Integration.EmbeddedResolvers
+namespace HotChocolate.Execution.Integration.EmbeddedResolvers
 {
     public class EmbeddedResolverTests
     {

diff --git a/...hocolate/Core/test/Execution.Tests/Integration/HelloWorldCodeFirst/DataStoreHelloWorld.cs b/...hocolate/Core/test/Execution.Tests/Integration/HelloWorldCodeFirst/DataStoreHelloWorld.cs
@@ -1,4 +1,4 @@
-namespace HotChocolate.Integration.HelloWorldCodeFirst
+namespace HotChocolate.Execution.Integration.HelloWorldCodeFirst
 {
     public class DataStoreHelloWorld
     {

diff --git a/...ate/Core/test/Execution.Tests/Integration/HelloWorldCodeFirst/HelloWorldCodeFirstTests.cs b/...ate/Core/test/Execution.Tests/Integration/HelloWorldCodeFirst/HelloWorldCodeFirstTests.cs
@@ -1,11 +1,11 @@
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using HotChocolate.Tests;
+using Microsoft.Extensions.DependencyInjection;
 using Snapshooter.Xunit;
 using Xunit;
 using static HotChocolate.Tests.TestHelper;
 
-namespace HotChocolate.Integration.HelloWorldCodeFirst
+namespace HotChocolate.Execution.Integration.HelloWorldCodeFirst
 {
     public class HelloWorldCodeFirstTests
     {

diff --git a/...Chocolate/Core/test/Execution.Tests/Integration/HelloWorldCodeFirst/MutationHelloWorld.cs b/...Chocolate/Core/test/Execution.Tests/Integration/HelloWorldCodeFirst/MutationHelloWorld.cs
@@ -1,6 +1,6 @@
 using HotChocolate.Types;
 
-namespace HotChocolate.Integration.HelloWorldCodeFirst
+namespace HotChocolate.Execution.Integration.HelloWorldCodeFirst
 {
     public class MutationHelloWorld
         : ObjectType

diff --git a/...HotChocolate/Core/test/Execution.Tests/Integration/HelloWorldCodeFirst/QueryHelloWorld.cs b/...HotChocolate/Core/test/Execution.Tests/Integration/HelloWorldCodeFirst/QueryHelloWorld.cs
@@ -1,6 +1,6 @@
 using HotChocolate.Types;
 
-namespace HotChocolate.Integration.HelloWorldCodeFirst
+namespace HotChocolate.Execution.Integration.HelloWorldCodeFirst
 {
     public class QueryHelloWorld
         : ObjectType

diff --git a/...Chocolate/Core/test/Execution.Tests/Integration/HelloWorldCodeFirst/QueryHelloWorldClr.cs b/...Chocolate/Core/test/Execution.Tests/Integration/HelloWorldCodeFirst/QueryHelloWorldClr.cs
@@ -1,4 +1,4 @@
-namespace HotChocolate.Integration.HelloWorldCodeFirst
+namespace HotChocolate.Execution.Integration.HelloWorldCodeFirst
 {
     public class QueryHelloWorldClr
     {

diff --git a/...Core/test/Execution.Tests/Integration/HelloWorldSchemaFirst/HelloWorldSchemaFirstTests.cs b/...Core/test/Execution.Tests/Integration/HelloWorldSchemaFirst/HelloWorldSchemaFirstTests.cs
@@ -1,12 +1,12 @@
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using HotChocolate.Resolvers;
 using HotChocolate.Tests;
+using Microsoft.Extensions.DependencyInjection;
 using Snapshooter.Xunit;
 using Xunit;
 using static HotChocolate.Tests.TestHelper;
 
-namespace HotChocolate.Integration.HelloWorldSchemaFirst
+namespace HotChocolate.Execution.Integration.HelloWorldSchemaFirst
 {
     public class HelloWorldSchemaFirstTests
     {

diff --git a/...st/Execution.Tests/Integration/InputOutputObjectAreTheSame/InputOutputObjectAreTheSame.cs b/...st/Execution.Tests/Integration/InputOutputObjectAreTheSame/InputOutputObjectAreTheSame.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
-using HotChocolate.Execution;
 using HotChocolate.Types;
 using Snapshooter.Xunit;
 using Xunit;
 
-namespace HotChocolate.Integration.InputOutputObjectAreTheSame
+namespace HotChocolate.Execution.Integration.InputOutputObjectAreTheSame
 {
     public class InputOutputObjectAreTheSame
     {

diff --git a/src/HotChocolate/Core/test/Execution.Tests/Integration/InputOutputObjectAreTheSame/Person.cs b/src/HotChocolate/Core/test/Execution.Tests/Integration/InputOutputObjectAreTheSame/Person.cs
@@ -1,4 +1,4 @@
-namespace HotChocolate.Integration.InputOutputObjectAreTheSame
+namespace HotChocolate.Execution.Integration.InputOutputObjectAreTheSame
 {
     public class Person
     {

diff --git a/src/HotChocolate/Core/test/Execution.Tests/Integration/InputOutputObjectAreTheSame/Query.cs b/src/HotChocolate/Core/test/Execution.Tests/Integration/InputOutputObjectAreTheSame/Query.cs
@@ -1,4 +1,4 @@
-namespace HotChocolate.Integration.InputOutputObjectAreTheSame
+namespace HotChocolate.Execution.Integration.InputOutputObjectAreTheSame
 {
     public class Query
     {

diff --git a/...ocolate/Core/test/Execution.Tests/Integration/StarWarsCodeFirst/StarWarsCodeFirstTests.cs b/...ocolate/Core/test/Execution.Tests/Integration/StarWarsCodeFirst/StarWarsCodeFirstTests.cs
@@ -1,15 +1,14 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
-using HotChocolate.Execution;
 using HotChocolate.Language;
 using HotChocolate.Tests;
+using Microsoft.Extensions.DependencyInjection;
 using Snapshooter;
 using Snapshooter.Xunit;
 using Xunit;
 using static HotChocolate.Tests.TestHelper;
 
-namespace HotChocolate.Integration.StarWarsCodeFirst
+namespace HotChocolate.Execution.Integration.StarWarsCodeFirst
 {
     public class StarWarsCodeFirstTests
     {
@@ -309,6 +308,32 @@ public async Task GraphQLOrgMutationExample()
                 .MatchSnapshotAsync();
         }
 
+        [Fact]
+        public async Task GraphQLOrgTwoMutationsExample()
+        {
+            Snapshot.FullName();
+            await ExpectValid(@"
+                mutation CreateReviewForEpisode(
+                    $ep: Episode!, $ep2: Episode!, $review: ReviewInput!) {
+                    createReview(episode: $ep, review: $review) {
+                        stars
+                        commentary
+                    }
+                    b: createReview(episode: $ep2, review: $review) {
+                        stars
+                        commentary
+                    }
+                }",
+                request: r => r
+                    .SetVariableValue("ep", new EnumValueNode("JEDI"))
+                    .SetVariableValue("ep2", new EnumValueNode("JEDI"))
+                    .SetVariableValue("review", new ObjectValueNode(
+                        new ObjectFieldNode("stars", new IntValueNode(5)),
+                        new ObjectFieldNode("commentary",
+                            new StringValueNode("This is a great movie!")))))
+                .MatchSnapshotAsync();
+        }
+
         [Fact]
         public async Task GraphQLOrgMutationExample_With_ValueVariables()
         {

diff --git a/...StarWarsCodeFirst/__snapshots__/StarWarsCodeFirstTests.GraphQLOrgTwoMutationsExample.snap b/...StarWarsCodeFirst/__snapshots__/StarWarsCodeFirstTests.GraphQLOrgTwoMutationsExample.snap
@@ -0,0 +1,12 @@
+{
+  "data": {
+    "createReview": {
+      "stars": 5,
+      "commentary": "This is a great movie!"
+    },
+    "b": {
+      "stars": 5,
+      "commentary": "This is a great movie!"
+    }
+  }
+}
diff --git a/src/HotChocolate/Core/test/Execution.Tests/Integration/TypeConverter/TypeConverterTests.cs b/src/HotChocolate/Core/test/Execution.Tests/Integration/TypeConverter/TypeConverterTests.cs
@@ -1,15 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using HotChocolate.Tests;
 using HotChocolate.Types;
 using HotChocolate.Utilities;
+using Microsoft.Extensions.DependencyInjection;
 using Snapshooter.Xunit;
 using Xunit;
 using static HotChocolate.Tests.TestHelper;
 
-namespace HotChocolate.Integration.TypeConverter
+namespace HotChocolate.Execution.Integration.TypeConverter
 {
     public class TypeConverterTests
     {