Fixed Playground Options Path Logic (#984)

ChilliCream · Aug 9, 2019 · 1820eba · 1820eba
1 parent 3e742a7
commit 1820eba
Show file tree

Hide file tree

Showing 79 changed files with 2,419 additions and 207 deletions.
diff --git a/build.cake b/build.cake
@@ -84,6 +84,18 @@ Task("Build")
     DotNetCoreBuild("./tools/Build.sln", settings);
 });
 
+Task("BuildDebug")
+    .IsDependentOn("EnvironmentSetup")
+    .Does(() =>
+{
+    var buildSettings = new DotNetCoreBuildSettings
+    {
+        Configuration = "Debug"
+    };
+
+    DotNetCoreBuild("./tools/Build.sln", buildSettings);
+});
+
 Task("BuildCore")
     .IsDependentOn("EnvironmentSetup")
     .Does(() =>
@@ -324,6 +336,11 @@ Task("Sonar")
     .IsDependentOn("Tests")
     .IsDependentOn("SonarEnd");
 
+Task("SonarSlim")
+    .IsDependentOn("SonarBegin")
+    .IsDependentOn("BuildDebug")
+    .IsDependentOn("SonarEnd");
+
 Task("Release")
     .IsDependentOn("Sonar")
     .IsDependentOn("Publish")

diff --git a/src/Core/Types.Filters.Tests/__snapshots__/StringFilterInputTypeTests.Ignore_Field_2.snap b/src/Core/Types.Filters.Tests/__snapshots__/StringFilterInputTypeTests.Ignore_Field_2.snap
@@ -0,0 +1,15 @@
+schema {
+  query: Query
+}
+
+type Query {
+  foo: String
+}
+
+input FooFilter {
+  AND: [FooFilter!]
+  OR: [FooFilter!]
+}
+
+"The `String` scalar type represents textual data, represented as UTF-8 character sequences. The String type is most often used by GraphQL to represent free-form human-readable text."
+scalar String
diff --git a/...ore/Types.Filters.Tests/__snapshots__/StringFilterInputTypeTests.Ignore_Field_Fields.snap b/...ore/Types.Filters.Tests/__snapshots__/StringFilterInputTypeTests.Ignore_Field_Fields.snap
@@ -0,0 +1,15 @@
+schema {
+  query: Query
+}
+
+type Query {
+  foo: String
+}
+
+input FooFilter {
+  AND: [FooFilter!]
+  OR: [FooFilter!]
+}
+
+"The `String` scalar type represents textual data, represented as UTF-8 character sequences. The String type is most often used by GraphQL to represent free-form human-readable text."
+scalar String
diff --git a/src/Server/AspNetClassic.GraphiQL/AspNetClassic.GraphiQL.csproj b/src/Server/AspNetClassic.GraphiQL/AspNetClassic.GraphiQL.csproj
@@ -28,6 +28,10 @@
     <PackageReference Include="Microsoft.Owin.StaticFiles" Version="4.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\AspNetClassic.Abstractions\AspNetClassic.Abstractions.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\Core\Core\Core.csproj" />
   </ItemGroup>

diff --git a/src/Server/AspNetClassic.Playground/AspNetClassic.Playground.csproj b/src/Server/AspNetClassic.Playground/AspNetClassic.Playground.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Core\Core\Core.csproj" />
+    <ProjectReference Include="..\AspNetClassic.Abstractions\AspNetClassic.Abstractions.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Server/AspNetClassic.Tests/ApplicationBuilderTests.cs b/src/Server/AspNetClassic.Tests/ApplicationBuilderTests.cs
@@ -2,7 +2,6 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using HotChocolate.Utilities;
-using HotChocolate.StarWars;
 using Moq;
 using Owin;
 using Snapshooter.Xunit;

diff --git a/src/Server/AspNetClassic.Tests/AspNetClassic.Tests.csproj b/src/Server/AspNetClassic.Tests/AspNetClassic.Tests.csproj
@@ -25,7 +25,15 @@
     <ProjectReference Include="..\..\Core\StarWars\StarWars.csproj" />
     <ProjectReference Include="..\..\Core\Subscriptions.InMemory\Subscriptions.InMemory.csproj" />
     <ProjectReference Include="..\AspNetClassic.Authorization\AspNetClassic.Authorization.csproj" />
+    <ProjectReference Include="..\AspNetClassic.GraphiQL\AspNetClassic.GraphiQL.csproj" />
+    <ProjectReference Include="..\AspNetClassic.Playground\AspNetClassic.Playground.csproj" />
+    <ProjectReference Include="..\AspNetClassic.Voyager\AspNetClassic.Voyager.csproj" />
     <ProjectReference Include="..\AspNetClassic\AspNetClassic.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="GraphiQL\__snapshots__\__mismatch__\" />
+    <Folder Include="Playground\__snapshots__\__mismatch__\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Server/AspNetClassic.Tests/GraphiQL/GraphiQLMiddlewareTests.cs b/src/Server/AspNetClassic.Tests/GraphiQL/GraphiQLMiddlewareTests.cs
@@ -0,0 +1,193 @@
+using System.Net.Http;
+using System.Threading.Tasks;
+using Snapshooter.Xunit;
+using Xunit;
+using HotChocolate.AspNetClassic.GraphiQL;
+using Microsoft.Owin.Testing;
+using Microsoft.Owin;
+
+namespace HotChocolate.AspNetClassic
+{
+    public class GraphiQLMiddlewareTests
+        : ServerTestBase
+    {
+        public GraphiQLMiddlewareTests(TestServerFactory serverFactory)
+            : base(serverFactory)
+        {
+        }
+
+        [Fact]
+        public async Task Default_Values()
+        {
+            // arrange
+            var options = new GraphiQLOptions();
+
+            TestServer server = CreateServer(options);
+            string settingsUri = "/graphiql/settings.js";
+
+            // act
+            string settings_js = await GetSettingsAsync(server, settingsUri);
+
+            // act
+            settings_js.MatchSnapshot();
+        }
+
+        [Fact]
+        public async Task Disable_Subscriptions()
+        {
+            // arrange
+            var options = new GraphiQLOptions();
+            options.EnableSubscription = false;
+
+            TestServer server = CreateServer(options);
+            string settingsUri = "/graphiql/settings.js";
+
+            // act
+            string settings_js = await GetSettingsAsync(server, settingsUri);
+
+            // act
+            settings_js.MatchSnapshot();
+        }
+
+        [Fact]
+        public async Task SetPath()
+        {
+            // arrange
+            var options = new GraphiQLOptions();
+            options.Path = new PathString("/foo");
+
+            TestServer server = CreateServer(options);
+            string settingsUri = "/foo/settings.js";
+
+            // act
+            string settings_js = await GetSettingsAsync(server, settingsUri);
+
+            // act
+            settings_js.MatchSnapshot();
+        }
+
+        [Fact]
+        public async Task SetPath_Then_SetQueryPath()
+        {
+            // arrange
+            var options = new GraphiQLOptions();
+            options.Path = new PathString("/foo");
+            options.QueryPath = new PathString("/bar");
+
+            TestServer server = CreateServer(options);
+            string settingsUri = "/foo/settings.js";
+
+            // act
+            string settings_js = await GetSettingsAsync(server, settingsUri);
+
+            // act
+            settings_js.MatchSnapshot();
+        }
+
+        [Fact]
+        public async Task SetQueryPath()
+        {
+            // arrange
+            var options = new GraphiQLOptions();
+            options.QueryPath = new PathString("/foo");
+
+            TestServer server = CreateServer(options);
+            string settingsUri = "/foo/graphiql/settings.js";
+
+            // act
+            string settings_js = await GetSettingsAsync(server, settingsUri);
+
+            // act
+            settings_js.MatchSnapshot();
+        }
+
+        [Fact]
+        public async Task SetQueryPath_Then_SetPath()
+        {
+            // arrange
+            var options = new GraphiQLOptions();
+            options.QueryPath = new PathString("/foo");
+            options.Path = new PathString("/bar");
+
+            TestServer server = CreateServer(options);
+            string settingsUri = "/bar/settings.js";
+
+            // act
+            string settings_js = await GetSettingsAsync(server, settingsUri);
+
+            // act
+            settings_js.MatchSnapshot();
+        }
+
+        [Fact]
+        public async Task SetQueryPath_Then_SetSubscriptionPath()
+        {
+            // arrange
+            var options = new GraphiQLOptions();
+            options.QueryPath = new PathString("/foo");
+            options.SubscriptionPath = new PathString("/bar");
+
+            TestServer server = CreateServer(options);
+            string settingsUri = "/foo/graphiql/settings.js";
+
+            // act
+            string settings_js = await GetSettingsAsync(server, settingsUri);
+
+            // act
+            settings_js.MatchSnapshot();
+        }
+
+        [Fact]
+        public async Task SetSubscriptionPath()
+        {
+            // arrange
+            var options = new GraphiQLOptions();
+            options.SubscriptionPath = new PathString("/foo");
+
+            TestServer server = CreateServer(options);
+            string settingsUri = "/graphiql/settings.js";
+
+            // act
+            string settings_js = await GetSettingsAsync(server, settingsUri);
+
+            // act
+            settings_js.MatchSnapshot();
+        }
+
+        [Fact]
+        public async Task SetSubscriptionPath_Then_SetQueryPath()
+        {
+            // arrange
+            var options = new GraphiQLOptions();
+            options.SubscriptionPath = new PathString("/foo");
+            options.QueryPath = new PathString("/bar");
+
+            TestServer server = CreateServer(options);
+            string settingsUri = "/bar/graphiql/settings.js";
+
+            // act
+            string settings_js = await GetSettingsAsync(server, settingsUri);
+
+            // act
+            settings_js.MatchSnapshot();
+        }
+
+        private TestServer CreateServer(GraphiQLOptions options)
+        {
+            return ServerFactory.Create(
+                services => services.AddStarWars(),
+                (app, sp) => app.UseGraphQL(sp).UseGraphiQL(options));
+        }
+
+        private async Task<string> GetSettingsAsync(
+            TestServer server,
+            string path)
+        {
+            HttpResponseMessage response =
+                await server.HttpClient.GetAsync(
+                    TestServerExtensions.CreateUrl(path));
+            response.EnsureSuccessStatusCode();
+            return await response.Content.ReadAsStringAsync();
+        }
+    }
+}