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

Merge pull request #7198 from aspnet/prkrishn/merge-2.2 

Prkrishn/merge 2.2
This commit is contained in:
Pranav K 2019-02-01 15:06:33 -08:00 committed by GitHub
parent 8f6853e155 00d58e84a2
commit d53f0da021
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>

5
src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj
View File

@ -12,5 +12,10 @@
<IsTestProject>false</IsTestProject> <IsTestProject>false</IsTestProject>
</PropertyGroup> </PropertyGroup>
<Target Name="InstallPuppeteer" BeforeTargets="Restore">
<!-- Explicitly install puppeteer. This will install the bundled Chromium as part of restore instead of as part of execution -->
<Exec Command="npm install puppeteer" />
</Target>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
</Project> </Project>

6
src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs
View File

@ -8,6 +8,7 @@ using System.Runtime.InteropServices;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting;
using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing;
using Microsoft.AspNetCore.Testing.xunit;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Logging.Testing;
using Xunit; using Xunit;
@ -25,7 +26,8 @@ namespace FunctionalTests
public ITestOutputHelper Output { get; } public ITestOutputHelper Output { get; }
[Theory] [ConditionalTheory]
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Disabling this test on OSX until we have a resolution for https://github.com/aspnet/AspNetCore-Internal/issues/1619")]
[InlineData("Startup")] [InlineData("Startup")]
[InlineData("StartupWithoutEndpointRouting")] [InlineData("StartupWithoutEndpointRouting")]
public async Task RunClientTests(string startup) public async Task RunClientTests(string startup)
@ -50,6 +52,8 @@ namespace FunctionalTests
Arguments = "test --no-watchman", Arguments = "test --no-watchman",
}; };
} }
// Disallow the test from downloading \ installing chromium.
processStartInfo.Environment["PUPPETEER_SKIP_CHROMIUM_DOWNLOAD"] = "true";
// Act // Act
var result = await ProcessManager.RunProcessAsync(processStartInfo, loggerFactory.CreateLogger("ProcessManager")); var result = await ProcessManager.RunProcessAsync(processStartInfo, loggerFactory.CreateLogger("ProcessManager"));