Add E2E tests

SteveSandersonMS · SteveSandersonMS · commit 26f0b79472ac · 2020-04-16T14:26:13.000+01:00
diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/wwwroot/index.html b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/wwwroot/index.html
@@ -7,6 +7,20 @@
 <body>
     <app>Loading...</app>
     <script src="customJsFileForTests.js"></script>
-    <script src="_framework/blazor.webassembly.js"></script>
+    <script src="_framework/blazor.webassembly.js" autostart="false"></script>
+
+    <!--
+        To show we can customize the boot resource loading process, the server looks for these
+        flags when collecting logs, and E2E tests check the right entries were seen.
+     -->
+    <script>
+        Blazor.start({
+            loadBootResource: function (type, name, defaultUri, integrity) {
+                return type === 'dotnetjs'
+                    ? `${defaultUri}?customizedbootresource=true`
+                    : fetch(defaultUri, { integrity: integrity, cache: 'no-cache', headers: { 'customizedbootresource': 'true' } });
+            }
+        });
+    </script>
 </body>
 </html>
diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Server/BootResourceRequestLog.cs b/src/Components/WebAssembly/testassets/HostedInAspNet.Server/BootResourceRequestLog.cs
@@ -6,7 +6,7 @@
 
 namespace HostedInAspNet.Server
 {
-    public class RequestLog
+    public class BootResourceRequestLog
     {
         private List<string> _requestPaths = new List<string>();
 
diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Server/Startup.cs b/src/Components/WebAssembly/testassets/HostedInAspNet.Server/Startup.cs
@@ -14,16 +14,21 @@ public class Startup
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddSingleton<RequestLog>();
+            services.AddSingleton<BootResourceRequestLog>();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, RequestLog requestLog)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, BootResourceRequestLog bootResourceRequestLog)
         {
             app.Use((context, next) =>
             {
-                // This is used by E2E tests to verify that the correct resources were fetched
-                requestLog.AddRequest(context.Request);
+                // This is used by E2E tests to verify that the correct resources were fetched,
+                // and that it was possible to override the loading mechanism
+                if (context.Request.Query.ContainsKey("customizedbootresource")
+                    || context.Request.Headers.ContainsKey("customizedbootresource"))
+                {
+                    bootResourceRequestLog.AddRequest(context.Request);
+                }
                 return next();
             });
 
diff --git a/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs b/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs
@@ -46,7 +46,8 @@ public void CachesResourcesAfterFirstLoad()
             var initialResourcesRequested = GetAndClearRequestedPaths();
             Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith("/blazor.boot.json")));
             Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith("/dotnet.wasm")));
-            Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith(".js")));
+            Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith("/dotnet.timezones.dat")));            
+            Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith(".js?customizedbootresource=true")));
             Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith(".dll")));
 
             // On subsequent loads, we skip the items referenced from blazor.boot.json
@@ -57,11 +58,12 @@ public void CachesResourcesAfterFirstLoad()
             var subsequentResourcesRequested = GetAndClearRequestedPaths();
             Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith("/blazor.boot.json")));
             Assert.Empty(subsequentResourcesRequested.Where(path => path.EndsWith("/dotnet.wasm")));
-            Assert.NotEmpty(subsequentResourcesRequested.Where(path => path.EndsWith(".js")));
+            Assert.Empty(initialResourcesRequested.Where(path => path.EndsWith("/dotnet.timezones.dat")));
+            Assert.NotEmpty(subsequentResourcesRequested.Where(path => path.EndsWith(".js?customizedbootresource=true")));
             Assert.Empty(subsequentResourcesRequested.Where(path => path.EndsWith(".dll")));
         }
 
-        [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/20154")]
+        [Fact]
         public void IncrementallyUpdatesCache()
         {
             // Perform a first load to populate the cache
@@ -137,7 +139,7 @@ private void AddCacheEntry(string url, string content)
 
         private IReadOnlyCollection<string> GetAndClearRequestedPaths()
         {
-            var requestLog = _serverFixture.Host.Services.GetRequiredService<RequestLog>();
+            var requestLog = _serverFixture.Host.Services.GetRequiredService<BootResourceRequestLog>();
             var result = requestLog.RequestPaths.ToList();
             requestLog.Clear();
             return result;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace HostedInAspNet.Server`
`8`	`8`	`{`
`9`		`- public class RequestLog`
	`9`	`+ public class BootResourceRequestLog`
`10`	`10`	`{`
`11`	`11`	`private List<string> _requestPaths = new List<string>();`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -14,16 +14,21 @@ public class Startup`
`14`	`14`	`// For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940`
`15`	`15`	`public void ConfigureServices(IServiceCollection services)`
`16`	`16`	`{`
`17`		`- services.AddSingleton<RequestLog>();`
	`17`	`+ services.AddSingleton<BootResourceRequestLog>();`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`
`21`		`- public void Configure(IApplicationBuilder app, IWebHostEnvironment env, RequestLog requestLog)`
	`21`	`+ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, BootResourceRequestLog bootResourceRequestLog)`
`22`	`22`	`{`
`23`	`23`	`app.Use((context, next) =>`
`24`	`24`	`{`
`25`		`- // This is used by E2E tests to verify that the correct resources were fetched`
`26`		`- requestLog.AddRequest(context.Request);`
	`25`	`+ // This is used by E2E tests to verify that the correct resources were fetched,`
	`26`	`+ // and that it was possible to override the loading mechanism`
	`27`	`+ if (context.Request.Query.ContainsKey("customizedbootresource")`
	`28`	`+ \|\| context.Request.Headers.ContainsKey("customizedbootresource"))`
	`29`	`+ {`
	`30`	`+ bootResourceRequestLog.AddRequest(context.Request);`
	`31`	`+ }`
`27`	`32`	`return next();`
`28`	`33`	`});`
`29`	`34`