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

Remove nginx tests, specify IIS config

This commit is contained in:
Chris Ross (ASP.NET) 2018-05-16 16:22:48 -07:00
parent 0c5be39112
commit 63f4d609cd
5 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MusicStore.sln
View File

@ -4,6 +4,8 @@ VisualStudioVersion = 15.0.26730.12
MinimumVisualStudioVersion = 15.0.26730.03 MinimumVisualStudioVersion = 15.0.26730.03
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7D749BDA-4638-4517-B66A-D40DEDEEB141}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7D749BDA-4638-4517-B66A-D40DEDEEB141}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
.appveyor.yml = .appveyor.yml
.travis.yml = .travis.yml
Directory.Build.props = Directory.Build.props Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets Directory.Build.targets = Directory.Build.targets
NuGet.config = NuGet.config NuGet.config = NuGet.config

13
test/MusicStore.E2ETests/Common/Helpers.cs
View File

@ -30,5 +30,18 @@ namespace E2ETests
return false; return false;
} }
} }
public static string GetConfigContent(ServerType serverType, string iisConfig)
{
var applicationBasePath = AppContext.BaseDirectory;
string content = null;
if (serverType == ServerType.IISExpress)
{
content = File.ReadAllText(Path.Combine(applicationBasePath, iisConfig));
}
return content;
}
} }
} }

4
test/MusicStore.E2ETests/OpenIdConnectTests.cs
View File

@ -14,7 +14,7 @@ namespace E2ETests
public class OpenIdConnectTests : LoggedTest public class OpenIdConnectTests : LoggedTest
{ {
public static TestMatrix TestVariants public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx) => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel)
.WithTfms(Tfm.NetCoreApp22, Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461); .WithTfms(Tfm.NetCoreApp22, Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461);
[ConditionalTheory] [ConditionalTheory]
@ -32,6 +32,8 @@ namespace E2ETests
ApplicationPath = Helpers.GetApplicationPath(), ApplicationPath = Helpers.GetApplicationPath(),
PublishApplicationBeforeDeployment = true, PublishApplicationBeforeDeployment = true,
PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging, PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging,
ServerConfigTemplateContent = Helpers.GetConfigContent(variant.Server, "Http.config"),
SiteName = "MusicStoreTestSite",
EnvironmentName = "OpenIdConnectTesting", EnvironmentName = "OpenIdConnectTesting",
UserAdditionalCleanup = parameters => UserAdditionalCleanup = parameters =>
{ {

4
test/MusicStore.E2ETests/PublishAndRunTests.cs
View File

@ -16,7 +16,7 @@ namespace E2ETests
public class PublishAndRunTests : LoggedTest public class PublishAndRunTests : LoggedTest
{ {
public static TestMatrix TestVariants public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys) => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp22, Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461) .WithTfms(Tfm.NetCoreApp22, Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461)
.WithAllApplicationTypes() .WithAllApplicationTypes()
.WithAllArchitectures() .WithAllArchitectures()
@ -38,6 +38,8 @@ namespace E2ETests
ApplicationPath = Helpers.GetApplicationPath(), ApplicationPath = Helpers.GetApplicationPath(),
PublishApplicationBeforeDeployment = true, PublishApplicationBeforeDeployment = true,
PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging, PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging,
ServerConfigTemplateContent = Helpers.GetConfigContent(variant.Server, "Http.config"),
SiteName = "MusicStoreTestSite",
UserAdditionalCleanup = parameters => UserAdditionalCleanup = parameters =>
{ {
DbUtils.DropDatabase(musicStoreDbName, logger); DbUtils.DropDatabase(musicStoreDbName, logger);

4
test/MusicStore.E2ETests/SmokeTests.cs
View File

@ -16,7 +16,7 @@ namespace E2ETests
public class SmokeTests : LoggedTest public class SmokeTests : LoggedTest
{ {
public static TestMatrix TestVariants public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys) => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp22, Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461) .WithTfms(Tfm.NetCoreApp22, Tfm.NetCoreApp21, Tfm.NetCoreApp20, Tfm.Net461)
.WithAllApplicationTypes(); .WithAllApplicationTypes();
@ -34,7 +34,7 @@ namespace E2ETests
{ {
ApplicationPath = Helpers.GetApplicationPath(), ApplicationPath = Helpers.GetApplicationPath(),
EnvironmentName = "SocialTesting", EnvironmentName = "SocialTesting",
ServerConfigTemplateContent = (variant.Server == ServerType.IISExpress) ? File.ReadAllText("Http.config") : null, ServerConfigTemplateContent = Helpers.GetConfigContent(variant.Server, "Http.config"),
SiteName = "MusicStoreTestSite", SiteName = "MusicStoreTestSite",
PublishApplicationBeforeDeployment = true, PublishApplicationBeforeDeployment = true,
PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging, PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging,