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

[Fixes #7587] Default to Development environment in tests

This commit is contained in:
Javier Calvarro Nelson 2018-04-16 14:35:59 -07:00
parent e0e96ce53b
commit e0b4c13895
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactory.cs
View File

@ -243,13 +243,22 @@ namespace Microsoft.AspNetCore.Mvc.Testing
/// array as arguments. /// array as arguments.
/// </remarks> /// </remarks>
/// <returns>A <see cref="IWebHostBuilder"/> instance.</returns> /// <returns>A <see cref="IWebHostBuilder"/> instance.</returns>
protected virtual IWebHostBuilder CreateWebHostBuilder() => protected virtual IWebHostBuilder CreateWebHostBuilder()
WebHostBuilderFactory.CreateFromTypesAssemblyEntryPoint<TEntryPoint>(Array.Empty<string>()) ?? {
throw new InvalidOperationException(Resources.FormatMissingCreateWebHostBuilderMethod( var builder = WebHostBuilderFactory.CreateFromTypesAssemblyEntryPoint<TEntryPoint>(Array.Empty<string>());
nameof(IWebHostBuilder), if (builder == null)
typeof(TEntryPoint).Assembly.EntryPoint.DeclaringType.FullName, {
typeof(WebApplicationFactory<TEntryPoint>).Name, throw new InvalidOperationException(Resources.FormatMissingCreateWebHostBuilderMethod(
nameof(CreateWebHostBuilder))); nameof(IWebHostBuilder),
typeof(TEntryPoint).Assembly.EntryPoint.DeclaringType.FullName,
typeof(WebApplicationFactory<TEntryPoint>).Name,
nameof(CreateWebHostBuilder)));
}
else
{
return builder.UseEnvironment("Development");
}
}
/// <summary> /// <summary>
/// Creates the <see cref="TestServer"/> with the bootstrapped application in <paramref name="builder"/>. /// Creates the <see cref="TestServer"/> with the bootstrapped application in <paramref name="builder"/>.

1
test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs
View File

@ -17,6 +17,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
{ {
builder builder
.UseRequestCulture<TStartup>("en-GB", "en-US") .UseRequestCulture<TStartup>("en-GB", "en-US")
.UseEnvironment("Production")
.ConfigureServices( .ConfigureServices(
services => services.Configure<MvcCompatibilityOptions>( services => services.Configure<MvcCompatibilityOptions>(
options => options.CompatibilityVersion = CompatibilityVersion.Version_2_1)); options => options.CompatibilityVersion = CompatibilityVersion.Version_2_1));