Enable components tests on helix

Update Helix.targets

Include more test assets

Update Microsoft.AspNetCore.Components.E2ETests.csproj

Switch to npm from yarn

Cleanup

Update InstallNode.ps1

Update ServerFixture.cs

Fix test site path

Update ServerFixture.cs

Update ServerFixture.cs

Update ServerFixture.cs

Make directory match project name

Deal with commas

Update ServerFixture.cs

Fix ref

Rename back

Remove copy

Update package.json

Fix files

Update BasicTestApp.csproj

Author: HaoK

eng/helix/content/InstallChrome.ps1

@@ -0,0 +1,4 @@
+$InstallerPath = "$env:Temp\chrome_installer.exe";
+Invoke-WebRequest "http://dl.google.com/chrome/install/375.126/chrome_installer.exe" -OutFile $InstallerPath;
+Start-Process -FilePath $InstallerPath -Args "/silent /install" -Verb RunAs -Wait;
+Remove-Item $InstallerPath

eng/helix/content/InstallJdk.ps1

@@ -59,4 +59,4 @@ Remove-Item -Force -Recurse $tempDir -ErrorAction Ignore | out-null
 
 if ($env:TF_BUILD) {
     Write-Host "##vso[task.prependpath]$installDir\bin"
-}
+}

eng/helix/content/InstallNode.ps1

@@ -5,21 +5,17 @@
      This script installs NodeJs from http://nodejs.org/dist on a machine. 
  .PARAMETER Version
      The version of NodeJS to install.
- .PARAMETER InstallDir
-     The directory to install NodeJS to.
  .LINK 
      https://nodejs.org/en/
  #> 
 param(
     [Parameter(Mandatory = $true)]
-    $Version,
-    
-    [Parameter(Mandatory = $true)]
-    $InstallDir
+    $Version
 )
 
 $ErrorActionPreference = 'Stop'
 $ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138
+$InstallDir = '.' # Use workload directory always
 
 Set-StrictMode -Version 1
 
@@ -59,9 +55,8 @@ else {
 
 Write-Host "Expanded NodeJs"
 New-Item -Path "$InstallDir" -ItemType "directory" -Force
-Write-Host "Copying $tempDir\$nodeFile\node.exe to $InstallDir"
-Copy-Item "$tempDir\$nodeFile\node.exe" "$InstallDir\node.exe"
-
+Write-Host "Copying $tempDir\$nodeFile\* to $InstallDir"
+Copy-Item "$tempDir\$nodeFile\*" "$InstallDir" -Recurse
 if (Test-Path "$InstallDir\node.exe")
 {
     Write-Host "Node.exe copied to $InstallDir"
@@ -70,3 +65,9 @@ else
 {
     Write-Host "Node.exe not copied to $InstallDir"
 }
+if (Test-Path "package-lock.json")
+{
+    $Env:Path += ";" + $Env:HELIX_CORRELATION_PAYLOAD + "\jdk\bin"
+    Write-Host "Found package-lock.json, running $InstallDir\npm install"
+    Invoke-Expression "$InstallDir\npm.cmd install"
+}

eng/helix/content/installnode.sh

@@ -39,3 +39,7 @@ echo "Installing node from $(basename $url) $url"
 mkdir $output_dir
 echo "Unpacking to $output_dir"
 tar --strip-components 1 -xzf "node-v$node_version-$platformarch.tar.gz" --no-same-owner --directory "$output_dir"
+if [ -f "package-lock.json" ]; then
+    echo "Found package-lock.json, running npm install"
+    npm install
+fi

eng/targets/Helix.targets

@@ -13,14 +13,18 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TestDependsOnNode)' == 'true' AND '$(IsWindowsHelixQueue)' == 'true'">
-    <HelixPreCommand Include="call RunPowershell.cmd InstallNode.ps1 $(NodeVersion) %25HELIX_CORRELATION_PAYLOAD%25\node\bin || exit /b 1" />
+    <HelixPreCommand Include="call RunPowershell.cmd InstallNode.ps1 $(NodeVersion) || exit /b 1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TestDependsOnAspNetRuntime)' == 'true' ">
     <!-- Grab all shipping packages. -->
     <HelixContent Include="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\*$(SharedFxVersion).nupkg" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TestDependsOnChrome)' == 'true' AND '$(IsWindowsHelixQueue)' == 'true'">
+    <HelixPreCommand Include="call RunPowershell.cmd InstallChrome.ps1 || exit /b 1" />
+  </ItemGroup>
+
   <ItemGroup>
     <!-- Java test projects do not use xUnit. -->
     <HelixContent Include="$(OutputPath)Microsoft.VisualStudio.TestPlatform.Extension.Xunit.Xml.TestAdapter.dll"

src/Components/test/E2ETest/Infrastructure/ServerFixtures/ServerFixture.cs

@@ -49,6 +49,21 @@ private static Dictionary<string, string> FindProjects()
 
         public static string FindSampleOrTestSitePath(string projectName)
         {
+            if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix")))
+            {
+                var comma = projectName.IndexOf(",");
+                if (comma != -1)
+                {
+                     projectName = projectName.Substring(0, comma);
+                }
+                var path = Path.Combine(AppContext.BaseDirectory, projectName);
+                if (!Directory.Exists(path))
+                {
+                    throw new ArgumentException($"Cannot find a sample or test site directory: '{path}'.");
+                }
+                return path;
+            }
+        
             var projects = _projects.Value;
             if (projects.TryGetValue(projectName, out var dir))
             {

src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj

@@ -7,20 +7,16 @@
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <TestGroupName>Components.E2ETests</TestGroupName>
 
-    <!-- https://github.com/dotnet/aspnetcore/issues/6857 -->
-    <BuildHelixPayload>false</BuildHelixPayload>
-
     <!-- Run on platforms where we support Selenium -->
     <SkipTests Condition="'$(SeleniumE2ETestsSupported)' != 'true'">true</SkipTests>
     <SkipTests Condition="'$(SeleniumE2ETestsSupported)' == 'true'">false</SkipTests>
 
-    <!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
-    <BaseOutputPath />
-
-    <OutputPath />
-
     <!-- This project references the shared framework transitively. Prevent restore errors by setting this flag. -->
     <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
+
+    <TestDependsOnNode>true</TestDependsOnNode>
+    <TestDependsOnJava>true</TestDependsOnJava>
+    <TestDependsOnChrome>true</TestDependsOnChrome>
   </PropertyGroup>
 
   <ItemGroup>
@@ -45,6 +41,16 @@
     <ProjectReference Include="..\..\WebAssembly\testassets\Wasm.Authentication.Server\Wasm.Authentication.Server.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <HelixContent Include="package.json" />
+    <HelixContent Include="package-lock.json" />
+    <HelixContent Include="..\..\..\Shared\E2ETesting\selenium-config.json" />
+    <HelixContent Include="..\testassets\**\*" />
+    <HelixContent Include="..\..\Blazor\testassets\StandaloneApp\**\*" />
+    <!-- This is currently windows only -->
+    <HelixProjectPlatform Remove="Linux;OSX" />
+  </ItemGroup>
+
   <!-- Shared testing infrastructure for running E2E tests using selenium -->
   <Import Project="$(SharedSourceRoot)E2ETesting\E2ETesting.targets" />