huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

React to hosting

This commit is contained in:
Hao Kung 2015-03-19 11:28:06 -07:00
parent e8d3fbf7bc
commit e7b0a76db9
4 changed files with 29 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/StaticFileSample/Startup.cs
View File

@ -18,8 +18,6 @@ namespace StaticFilesSample
// Displays all log levels // Displays all log levels
factory.AddConsole(LogLevel.Verbose); factory.AddConsole(LogLevel.Verbose);
app.UseRequestServices();
app.UseFileServer(new FileServerOptions() app.UseFileServer(new FileServerOptions()
{ {
EnableDirectoryBrowsing = true, EnableDirectoryBrowsing = true,

1
samples/StaticFileSample/project.json
View File

@ -4,7 +4,6 @@
}, },
"dependencies": { "dependencies": {
"Kestrel": "1.0.0-*", "Kestrel": "1.0.0-*",
"Microsoft.AspNet.RequestContainer": "1.0.0-*",
"Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.IIS": "1.0.0-*",
"Microsoft.AspNet.Server.WebListener": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
"Microsoft.AspNet.StaticFiles": "1.0.0-*", "Microsoft.AspNet.StaticFiles": "1.0.0-*",

82
test/Microsoft.AspNet.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs
View File

@ -19,28 +19,19 @@ namespace Microsoft.AspNet.StaticFiles
[Fact] [Fact]
public async Task NullArguments() public async Task NullArguments()
{ {
Assert.Throws<ArgumentException>(() => TestServer.Create(app => Assert.Throws<ArgumentException>(() => TestServer.Create(
{ app => app.UseDirectoryBrowser(new DirectoryBrowserOptions() { Formatter = null }),
app.UseServices(services => services.AddDirectoryBrowser()); services => services.AddDirectoryBrowser()));
app.UseDirectoryBrowser(new DirectoryBrowserOptions() { Formatter = null });
}));
// No exception, default provided // No exception, default provided
TestServer.Create(app => TestServer.Create(
{ app => app.UseDirectoryBrowser(new DirectoryBrowserOptions() { FileProvider = null }),
app.UseServices(services => services.AddDirectoryBrowser()); services => services.AddDirectoryBrowser());
app.UseDirectoryBrowser(new DirectoryBrowserOptions() { FileProvider = null });
});
// PathString(null) is OK. // PathString(null) is OK.
TestServer server = TestServer.Create(app => TestServer server = TestServer.Create(
{ app => app.UseDirectoryBrowser((string)null),
app.UseServices(services => services.AddDirectoryBrowser()); services => services.AddDirectoryBrowser());
app.UseDirectoryBrowser((string)null);
});
var response = await server.CreateClient().GetAsync("/"); var response = await server.CreateClient().GetAsync("/");
Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.Equal(HttpStatusCode.OK, response.StatusCode);
@ -54,16 +45,13 @@ namespace Microsoft.AspNet.StaticFiles
[InlineData("", @".\", "/missing.dir")] [InlineData("", @".\", "/missing.dir")]
public async Task NoMatch_PassesThrough(string baseUrl, string baseDir, string requestUrl) public async Task NoMatch_PassesThrough(string baseUrl, string baseDir, string requestUrl)
{ {
TestServer server = TestServer.Create(app => TestServer server = TestServer.Create(
{ app => app.UseDirectoryBrowser(new DirectoryBrowserOptions()
app.UseServices(services => services.AddDirectoryBrowser());
app.UseDirectoryBrowser(new DirectoryBrowserOptions()
{ {
RequestPath = new PathString(baseUrl), RequestPath = new PathString(baseUrl),
FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir)) FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
}); }),
}); services => services.AddDirectoryBrowser());
HttpResponseMessage response = await server.CreateRequest(requestUrl).GetAsync(); HttpResponseMessage response = await server.CreateRequest(requestUrl).GetAsync();
Assert.Equal(HttpStatusCode.NotFound, response.StatusCode); Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
} }
@ -76,16 +64,13 @@ namespace Microsoft.AspNet.StaticFiles
[InlineData("/somedir", @".", "/somedir/subfolder/")] [InlineData("/somedir", @".", "/somedir/subfolder/")]
public async Task FoundDirectory_Served(string baseUrl, string baseDir, string requestUrl) public async Task FoundDirectory_Served(string baseUrl, string baseDir, string requestUrl)
{ {
TestServer server = TestServer.Create(app => TestServer server = TestServer.Create(
{ app => app.UseDirectoryBrowser(new DirectoryBrowserOptions()
app.UseServices(services => services.AddDirectoryBrowser());
app.UseDirectoryBrowser(new DirectoryBrowserOptions()
{ {
RequestPath = new PathString(baseUrl), RequestPath = new PathString(baseUrl),
FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir)) FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
}); }),
}); services => services.AddDirectoryBrowser());
HttpResponseMessage response = await server.CreateRequest(requestUrl).GetAsync(); HttpResponseMessage response = await server.CreateRequest(requestUrl).GetAsync();
Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.Equal(HttpStatusCode.OK, response.StatusCode);
@ -103,16 +88,13 @@ namespace Microsoft.AspNet.StaticFiles
[InlineData("/somedir", @".", "/somedir/subfolder", "?a=b")] [InlineData("/somedir", @".", "/somedir/subfolder", "?a=b")]
public async Task NearMatch_RedirectAddSlash(string baseUrl, string baseDir, string requestUrl, string queryString) public async Task NearMatch_RedirectAddSlash(string baseUrl, string baseDir, string requestUrl, string queryString)
{ {
TestServer server = TestServer.Create(app => TestServer server = TestServer.Create(
{ app => app.UseDirectoryBrowser(new DirectoryBrowserOptions()
app.UseServices(services => services.AddDirectoryBrowser());
app.UseDirectoryBrowser(new DirectoryBrowserOptions()
{ {
RequestPath = new PathString(baseUrl), RequestPath = new PathString(baseUrl),
FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir)) FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
}); }),
}); services => services.AddDirectoryBrowser());
HttpResponseMessage response = await server.CreateRequest(requestUrl + queryString).GetAsync(); HttpResponseMessage response = await server.CreateRequest(requestUrl + queryString).GetAsync();
@ -128,16 +110,13 @@ namespace Microsoft.AspNet.StaticFiles
[InlineData("/somedir", @".", "/somedir/subfolder/")] [InlineData("/somedir", @".", "/somedir/subfolder/")]
public async Task PostDirectory_PassesThrough(string baseUrl, string baseDir, string requestUrl) public async Task PostDirectory_PassesThrough(string baseUrl, string baseDir, string requestUrl)
{ {
TestServer server = TestServer.Create(app => TestServer server = TestServer.Create(
{ app => app.UseDirectoryBrowser(new DirectoryBrowserOptions()
app.UseServices(services => services.AddDirectoryBrowser());
app.UseDirectoryBrowser(new DirectoryBrowserOptions()
{ {
RequestPath = new PathString(baseUrl), RequestPath = new PathString(baseUrl),
FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir)) FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
}); }),
}); services => services.AddDirectoryBrowser());
HttpResponseMessage response = await server.CreateRequest(requestUrl).PostAsync(); HttpResponseMessage response = await server.CreateRequest(requestUrl).PostAsync();
Assert.Equal(HttpStatusCode.NotFound, response.StatusCode); Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
@ -150,16 +129,13 @@ namespace Microsoft.AspNet.StaticFiles
[InlineData("/somedir", @".", "/somedir/subfolder/")] [InlineData("/somedir", @".", "/somedir/subfolder/")]
public async Task HeadDirectory_HeadersButNotBodyServed(string baseUrl, string baseDir, string requestUrl) public async Task HeadDirectory_HeadersButNotBodyServed(string baseUrl, string baseDir, string requestUrl)
{ {
TestServer server = TestServer.Create(app => TestServer server = TestServer.Create(
{ app => app.UseDirectoryBrowser(new DirectoryBrowserOptions()
app.UseServices(services => services.AddDirectoryBrowser());
app.UseDirectoryBrowser(new DirectoryBrowserOptions()
{ {
RequestPath = new PathString(baseUrl), RequestPath = new PathString(baseUrl),
FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir)) FileProvider = new PhysicalFileProvider(Path.Combine(Environment.CurrentDirectory, baseDir))
}); }),
}); services => services.AddDirectoryBrowser());
HttpResponseMessage response = await server.CreateRequest(requestUrl).SendAsync("HEAD"); HttpResponseMessage response = await server.CreateRequest(requestUrl).SendAsync("HEAD");

1
test/Microsoft.AspNet.StaticFiles.Tests/project.json
View File

@ -1,7 +1,6 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.Http.Core": "1.0.0-*", "Microsoft.AspNet.Http.Core": "1.0.0-*",
"Microsoft.AspNet.RequestContainer": "1.0.0-*",
"Microsoft.AspNet.StaticFiles": "1.0.0-*", "Microsoft.AspNet.StaticFiles": "1.0.0-*",
"Microsoft.AspNet.TestHost": "1.0.0-*", "Microsoft.AspNet.TestHost": "1.0.0-*",
"Microsoft.Framework.Logging.Testing": "1.0.0-*", "Microsoft.Framework.Logging.Testing": "1.0.0-*",