update dependencies of integration tests

rose-a · rose-a · commit ce649f78b556 · 2021-09-13T14:50:51.000+02:00
diff --git a/tests/GraphQL.Client.Tests.Common/Chat/AddMessageVariables.cs b/tests/GraphQL.Client.Tests.Common/Chat/AddMessageVariables.cs
@@ -12,7 +12,7 @@ public class AddMessageInput
 
             public string Content { get; set; }
 
-            public DateTime SentAt { get; set; }
+            public string SentAt { get; set; }
         }
     }
 }
diff --git a/tests/GraphQL.Client.Tests.Common/Chat/GraphQLClientChatExtensions.cs b/tests/GraphQL.Client.Tests.Common/Chat/GraphQLClientChatExtensions.cs
@@ -10,7 +10,7 @@ public static class GraphQLClientChatExtensions
 @"mutation($input: MessageInputType){
   addMessage(message: $input){
     content
-  }  
+  }
 }";
 
         public static Task<GraphQLResponse<AddMessageMutationResult>> AddMessageAsync(this IGraphQLClient client, string message)
@@ -21,7 +21,7 @@ public static Task<GraphQLResponse<AddMessageMutationResult>> AddMessageAsync(th
                 {
                     FromId = "2",
                     Content = message,
-                    SentAt = DateTime.Now
+                    SentAt = DateTime.Now.ToString("s")
                 }
             };
 
diff --git a/tests/GraphQL.Client.Tests.Common/Chat/Schema/ChatMutation.cs b/tests/GraphQL.Client.Tests.Common/Chat/Schema/ChatMutation.cs
@@ -36,7 +36,7 @@ public MessageInputType()
         {
             Field<StringGraphType>("fromId");
             Field<StringGraphType>("content");
-            Field<DateGraphType>("sentAt");
+            Field<DateTimeGraphType>("sentAt");
         }
     }
 }
diff --git a/tests/GraphQL.Client.Tests.Common/Chat/Schema/ChatSchema.cs b/tests/GraphQL.Client.Tests.Common/Chat/Schema/ChatSchema.cs
@@ -1,13 +1,16 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
 namespace GraphQL.Client.Tests.Common.Chat.Schema
 {
     public class ChatSchema : Types.Schema
     {
-        public ChatSchema(IDependencyResolver resolver)
-            : base(resolver)
+        public ChatSchema(IServiceProvider services)
+            : base(services)
         {
-            Query = resolver.Resolve<ChatQuery>();
-            Mutation = resolver.Resolve<ChatMutation>();
-            Subscription = resolver.Resolve<ChatSubscriptions>();
+            Query = services.GetRequiredService<ChatQuery>();
+            Mutation = services.GetRequiredService<ChatMutation>();
+            Subscription = services.GetRequiredService<ChatSubscriptions>();
         }
     }
 }
diff --git a/tests/GraphQL.Client.Tests.Common/Chat/Schema/ChatSubscriptions.cs b/tests/GraphQL.Client.Tests.Common/Chat/Schema/ChatSubscriptions.cs
@@ -61,9 +61,9 @@ public ChatSubscriptions(IChat chat)
             });
         }
 
-        private IObservable<Message> SubscribeById(ResolveEventStreamContext context)
+        private IObservable<Message> SubscribeById(IResolveEventStreamContext context)
         {
-            var messageContext = context.UserContext.As<MessageHandlingContext>();
+            var messageContext = (MessageHandlingContext) context.UserContext;
             var user = messageContext.Get<ClaimsPrincipal>("user");
 
             var sub = "Anonymous";
@@ -76,16 +76,16 @@ private IObservable<Message> SubscribeById(ResolveEventStreamContext context)
             return messages.Where(message => message.From.Id == id);
         }
 
-        private Message ResolveMessage(ResolveFieldContext context)
+        private Message ResolveMessage(IResolveFieldContext context)
         {
             var message = context.Source as Message;
 
             return message;
         }
 
-        private IObservable<Message> Subscribe(ResolveEventStreamContext context)
+        private IObservable<Message> Subscribe(IResolveEventStreamContext context)
         {
-            var messageContext = context.UserContext.As<MessageHandlingContext>();
+            var messageContext = (MessageHandlingContext) context.UserContext;
             var user = messageContext.Get<ClaimsPrincipal>("user");
 
             var sub = "Anonymous";
diff --git a/tests/GraphQL.Client.Tests.Common/Chat/Schema/MessageType.cs b/tests/GraphQL.Client.Tests.Common/Chat/Schema/MessageType.cs
@@ -12,7 +12,7 @@ public MessageType()
             Field(o => o.From, false, typeof(MessageFromType)).Resolve(ResolveFrom);
         }
 
-        private MessageFrom ResolveFrom(ResolveFieldContext<Message> context)
+        private MessageFrom ResolveFrom(IResolveFieldContext<Message> context)
         {
             var message = context.Source;
             return message.From;
diff --git a/tests/GraphQL.Client.Tests.Common/Common.cs b/tests/GraphQL.Client.Tests.Common/Common.cs
@@ -13,15 +13,13 @@ public static class Common
         public static StarWarsSchema GetStarWarsSchema()
         {
             var services = new ServiceCollection();
-            services.AddTransient<IDependencyResolver>(provider => new FuncDependencyResolver(provider.GetService));
             services.AddStarWarsSchema();
             return services.BuildServiceProvider().GetRequiredService<StarWarsSchema>();
         }
 
         public static ChatSchema GetChatSchema()
         {
             var services = new ServiceCollection();
-            services.AddTransient<IDependencyResolver>(provider => new FuncDependencyResolver(provider.GetService));
             services.AddChatSchema();
             return services.BuildServiceProvider().GetRequiredService<ChatSchema>();
         }
diff --git a/tests/GraphQL.Client.Tests.Common/GraphQL.Client.Tests.Common.csproj b/tests/GraphQL.Client.Tests.Common/GraphQL.Client.Tests.Common.csproj
@@ -7,13 +7,11 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="GraphQL" Version="2.4.0" />
-    <PackageReference Include="GraphQL.Server.Transports.Subscriptions.Abstractions" Version="3.4.0" />
+    <PackageReference Include="GraphQL" Version="4.6.0" />
+    <PackageReference Include="GraphQL.Server.Transports.Subscriptions.Abstractions" Version="5.0.2" />
     <PackageReference Include="GraphQL.StarWars" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Reactive.Testing" Version="4.3.2" />
-    <PackageReference Include="System.Reactive" Version="4.3.2" />
-    <PackageReference Include="System.Reactive.Compatibility" Version="4.3.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
+    <PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/GraphQL.Integration.Tests/GraphQL.Integration.Tests.csproj b/tests/GraphQL.Integration.Tests/GraphQL.Integration.Tests.csproj
@@ -8,9 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.1" />
-    <PackageReference Include="Microsoft.Reactive.Testing" Version="4.3.2" />
-    <PackageReference Include="System.Reactive" Version="4.3.2" />
-    <PackageReference Include="System.Reactive.Compatibility" Version="4.3.2" />
+    <PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/GraphQL.Integration.Tests/WebsocketTests/Base.cs b/tests/GraphQL.Integration.Tests/WebsocketTests/Base.cs
@@ -67,6 +67,7 @@ public async void CanSendRequestViaWebsocket()
             await ChatClient.InitializeWebsocketConnection();
             const string message = "some random testing message";
             var response = await ChatClient.AddMessageAsync(message);
+            response.Errors.Should().BeNullOrEmpty();
             response.Data.AddMessage.Content.Should().Be(message);
         }
 
@@ -77,6 +78,7 @@ public async void CanUseWebSocketScheme()
             await ChatClient.InitializeWebsocketConnection();
             const string message = "some random testing message";
             var response = await ChatClient.AddMessageAsync(message);
+            response.Errors.Should().BeNullOrEmpty();
             response.Data.AddMessage.Content.Should().Be(message);
         }
         
@@ -89,6 +91,7 @@ public async void CanUseDedicatedWebSocketEndpoint()
             await ChatClient.InitializeWebsocketConnection();
             const string message = "some random testing message";
             var response = await ChatClient.AddMessageAsync(message);
+            response.Errors.Should().BeNullOrEmpty();
             response.Data.AddMessage.Content.Should().Be(message);
         }
         
@@ -174,10 +177,12 @@ public async void CanCreateObservableSubscription()
             Debug.WriteLine("subscribing...");
             using var observer = observable.Observe();
             await observer.Should().PushAsync(1);
+            observer.RecordedMessages.Last().Errors.Should().BeNullOrEmpty();
             observer.RecordedMessages.Last().Data.MessageAdded.Content.Should().Be(InitialMessage.Content);
 
             const string message1 = "Hello World";
             var response = await ChatClient.AddMessageAsync(message1);
+            response.Errors.Should().BeNullOrEmpty();
             response.Data.AddMessage.Content.Should().Be(message1);
             await observer.Should().PushAsync(2);
             observer.RecordedMessages.Last().Data.MessageAdded.Content.Should().Be(message1);
diff --git a/tests/IntegrationTestServer/IntegrationTestServer.csproj b/tests/IntegrationTestServer/IntegrationTestServer.csproj
@@ -10,15 +10,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="3.4.0" />
-    <PackageReference Include="GraphQL.Server.Transports.Subscriptions.Abstractions" Version="3.4.0" />
-    <PackageReference Include="GraphQL.Server.Transports.WebSockets" Version="3.4.0" />
-    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="3.4.0" />
-    <PackageReference Include="GraphQL.Server.Ui.Playground" Version="3.4.0" />
-    <PackageReference Include="GraphQL.Server.Ui.Voyager" Version="3.4.0" />
+    <PackageReference Include="GraphQL.Server.All" Version="5.0.2" />
     <PackageReference Include="GraphQL.StarWars" Version="1.0.0" />
-    <PackageReference Include="System.Reactive" Version="4.3.2" />
-    <PackageReference Include="System.Reactive.Compatibility" Version="4.3.2" />
+    <PackageReference Include="System.Reactive" Version="5.0.0" />
+    <PackageReference Include="System.Reactive.Compatibility" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/IntegrationTestServer/Properties/launchSettings.json b/tests/IntegrationTestServer/Properties/launchSettings.json
@@ -22,7 +22,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://localhost:5005/"
+      "applicationUrl": "http://localhost:5005"
     }
   }
-}
+}
diff --git a/tests/IntegrationTestServer/Startup.cs b/tests/IntegrationTestServer/Startup.cs
@@ -2,6 +2,7 @@
 using GraphQL.Client.Tests.Common;
 using GraphQL.Client.Tests.Common.Chat.Schema;
 using GraphQL.Server;
+using GraphQL.Server.Ui.Altair;
 using GraphQL.Server.Ui.GraphiQL;
 using GraphQL.Server.Ui.Playground;
 using GraphQL.StarWars;
@@ -12,6 +13,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 
 namespace IntegrationTestServer
 {
@@ -32,16 +34,21 @@ public Startup(IConfiguration configuration, IWebHostEnvironment environment)
         public void ConfigureServices(IServiceCollection services)
         {
             services.Configure<KestrelServerOptions>(options => options.AllowSynchronousIO = true);
-
-            services.AddTransient<IDependencyResolver>(provider => new FuncDependencyResolver(provider.GetService));
+            //
             services.AddChatSchema();
             services.AddStarWarsSchema();
-            services.AddGraphQL(options =>
+            services.AddSingleton<IDocumentExecuter, SubscriptionDocumentExecuter>();
+            services.AddGraphQL((options, services) =>
             {
                 options.EnableMetrics = true;
-                options.ExposeExceptions = Environment.IsDevelopment();
+                var logger = services.GetRequiredService<ILogger<Startup>>();
+                options.UnhandledExceptionDelegate = ctx => logger.LogError("{Error} occurred", ctx.OriginalException.Message);
             })
-                .AddWebSockets();
+                .AddErrorInfoProvider(opt => opt.ExposeExceptionStackTrace = Environment.IsDevelopment())
+                .AddSystemTextJson()
+                .AddWebSockets()
+                .AddGraphTypes(typeof(ChatSchema))
+                .AddGraphTypes(typeof(StarWarsSchema));
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -57,16 +64,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             ConfigureGraphQLSchema<ChatSchema>(app, Common.CHAT_ENDPOINT);
             ConfigureGraphQLSchema<StarWarsSchema>(app, Common.STAR_WARS_ENDPOINT);
 
-            app.UseGraphiQLServer(new GraphiQLOptions
-            {
-                GraphiQLPath = "/ui/graphiql",
-                GraphQLEndPoint = Common.STAR_WARS_ENDPOINT
-            });
-            app.UseGraphQLPlayground(new GraphQLPlaygroundOptions
-            {
-                Path = "/ui/playground",
-                GraphQLEndPoint = Common.CHAT_ENDPOINT
-            });
+            app.UseGraphQLGraphiQL(new GraphiQLOptions { GraphQLEndPoint = Common.STAR_WARS_ENDPOINT });
+            app.UseGraphQLAltair(new AltairOptions { GraphQLEndPoint = Common.CHAT_ENDPOINT });
         }
 
         private void ConfigureGraphQLSchema<TSchema>(IApplicationBuilder app, string endpoint) where TSchema : Schema

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class AddMessageInput`
`12`	`12`
`13`	`13`	`public string Content { get; set; }`
`14`	`14`
`15`		`- public DateTime SentAt { get; set; }`
	`15`	`+ public string SentAt { get; set; }`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public MessageInputType()`
`36`	`36`	`{`
`37`	`37`	`Field<StringGraphType>("fromId");`
`38`	`38`	`Field<StringGraphType>("content");`
`39`		`- Field<DateGraphType>("sentAt");`
	`39`	`+ Field<DateTimeGraphType>("sentAt");`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,16 @@`
	`1`	`+using System;`
	`2`	`+using Microsoft.Extensions.DependencyInjection;`
	`3`	`+`
`1`	`4`	`namespace GraphQL.Client.Tests.Common.Chat.Schema`
`2`	`5`	`{`
`3`	`6`	`public class ChatSchema : Types.Schema`
`4`	`7`	`{`
`5`		`- public ChatSchema(IDependencyResolver resolver)`
`6`		`- : base(resolver)`
	`8`	`+ public ChatSchema(IServiceProvider services)`
	`9`	`+ : base(services)`
`7`	`10`	`{`
`8`		`- Query = resolver.Resolve<ChatQuery>();`
`9`		`- Mutation = resolver.Resolve<ChatMutation>();`
`10`		`- Subscription = resolver.Resolve<ChatSubscriptions>();`
	`11`	`+ Query = services.GetRequiredService<ChatQuery>();`
	`12`	`+ Mutation = services.GetRequiredService<ChatMutation>();`
	`13`	`+ Subscription = services.GetRequiredService<ChatSubscriptions>();`
`11`	`14`	`}`
`12`	`15`	`}`
`13`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,9 @@ public ChatSubscriptions(IChat chat)`
`61`	`61`	`});`
`62`	`62`	`}`
`63`	`63`
`64`		`- private IObservable<Message> SubscribeById(ResolveEventStreamContext context)`
	`64`	`+ private IObservable<Message> SubscribeById(IResolveEventStreamContext context)`
`65`	`65`	`{`
`66`		`- var messageContext = context.UserContext.As<MessageHandlingContext>();`
	`66`	`+ var messageContext = (MessageHandlingContext) context.UserContext;`
`67`	`67`	`var user = messageContext.Get<ClaimsPrincipal>("user");`
`68`	`68`
`69`	`69`	`var sub = "Anonymous";`
`@@ -76,16 +76,16 @@ private IObservable<Message> SubscribeById(ResolveEventStreamContext context)`
`76`	`76`	`return messages.Where(message => message.From.Id == id);`
`77`	`77`	`}`
`78`	`78`
`79`		`- private Message ResolveMessage(ResolveFieldContext context)`
	`79`	`+ private Message ResolveMessage(IResolveFieldContext context)`
`80`	`80`	`{`
`81`	`81`	`var message = context.Source as Message;`
`82`	`82`
`83`	`83`	`return message;`
`84`	`84`	`}`
`85`	`85`
`86`		`- private IObservable<Message> Subscribe(ResolveEventStreamContext context)`
	`86`	`+ private IObservable<Message> Subscribe(IResolveEventStreamContext context)`
`87`	`87`	`{`
`88`		`- var messageContext = context.UserContext.As<MessageHandlingContext>();`
	`88`	`+ var messageContext = (MessageHandlingContext) context.UserContext;`
`89`	`89`	`var user = messageContext.Get<ClaimsPrincipal>("user");`
`90`	`90`
`91`	`91`	`var sub = "Anonymous";`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public MessageType()`
`12`	`12`	`Field(o => o.From, false, typeof(MessageFromType)).Resolve(ResolveFrom);`
`13`	`13`	`}`
`14`	`14`
`15`		`- private MessageFrom ResolveFrom(ResolveFieldContext<Message> context)`
	`15`	`+ private MessageFrom ResolveFrom(IResolveFieldContext<Message> context)`
`16`	`16`	`{`
`17`	`17`	`var message = context.Source;`
`18`	`18`	`return message.From;`
Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,13 @@ public static class Common`
`13`	`13`	`public static StarWarsSchema GetStarWarsSchema()`
`14`	`14`	`{`
`15`	`15`	`var services = new ServiceCollection();`
`16`		`- services.AddTransient<IDependencyResolver>(provider => new FuncDependencyResolver(provider.GetService));`
`17`	`16`	`services.AddStarWarsSchema();`
`18`	`17`	`return services.BuildServiceProvider().GetRequiredService<StarWarsSchema>();`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`public static ChatSchema GetChatSchema()`
`22`	`21`	`{`
`23`	`22`	`var services = new ServiceCollection();`
`24`		`- services.AddTransient<IDependencyResolver>(provider => new FuncDependencyResolver(provider.GetService));`
`25`	`23`	`services.AddChatSchema();`
`26`	`24`	`return services.BuildServiceProvider().GetRequiredService<ChatSchema>();`
`27`	`25`	`}`