Skip to content
This repository has been archived by the owner on Nov 20, 2023. It is now read-only.

Update test dependencies #1356

Merged
merged 2 commits into from
Apr 15, 2022
Merged

Update test dependencies #1356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62faeac
Update jquery in E2E test.
philliphoff Apr 13, 2022
6c8f24f
Fixup many E2E tests.
philliphoff Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions test/E2ETest/TyeRunTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public async Task FrontendBackendAzureFunctionTest()

[ConditionalTheory]
[SkipIfDockerNotRunning]
[InlineData("single-project", "mcr.microsoft.com/dotnet/core/aspnet:3.1")]
[InlineData("single-project", "mcr.microsoft.com/dotnet/aspnet:6.0")]
[InlineData("single-project-5.0", "mcr.microsoft.com/dotnet/aspnet:5.0")]
public async Task SingleProjectWithDocker_UsesCorrectBaseImage(string projectName, string baseImage)
{
Expand Down Expand Up @@ -251,7 +251,7 @@ public async Task FrontendProjectBackendDocker()
application.Services.Remove(project);

var outputFileName = project.AssemblyName + ".dll";
var container = new ContainerServiceBuilder(project.Name, $"mcr.microsoft.com/dotnet/core/aspnet:{project.TargetFrameworkVersion}", ServiceSource.Configuration)
var container = new ContainerServiceBuilder(project.Name, $"mcr.microsoft.com/dotnet/aspnet:{project.TargetFrameworkVersion}", ServiceSource.Configuration)
{
IsAspNet = true
};
Expand Down Expand Up @@ -298,7 +298,7 @@ public async Task FrontendDockerBackendProject()
application.Services.Remove(project);

var outputFileName = project.AssemblyName + ".dll";
var container = new ContainerServiceBuilder(project.Name, $"mcr.microsoft.com/dotnet/core/aspnet:{project.TargetFrameworkVersion}", ServiceSource.Configuration)
var container = new ContainerServiceBuilder(project.Name, $"mcr.microsoft.com/dotnet/aspnet:{project.TargetFrameworkVersion}", ServiceSource.Configuration)
{
IsAspNet = true
};
Expand Down Expand Up @@ -445,8 +445,8 @@ public async Task DockerBaseImageAndTagTest()
var project = (DotnetProjectServiceBuilder)application.Services.First(s => s.Name == "backend-baseimage");

// check ContainerInfo values
Assert.True(string.Equals(project.ContainerInfo!.BaseImageName, "mcr.microsoft.com/dotnet/core/sdk"));
Assert.True(string.Equals(project.ContainerInfo!.BaseImageTag, "3.1-buster"));
Assert.True(string.Equals(project.ContainerInfo!.BaseImageName, "mcr.microsoft.com/dotnet/sdk"));
Assert.True(string.Equals(project.ContainerInfo!.BaseImageTag, "6.0-focal"));

// check projectInfo values
var projectRunInfo = new ProjectRunInfo(project);
Expand Down Expand Up @@ -1194,7 +1194,7 @@ public async Task RunCliArgDoesNotOverrideYamlMultipleTargetFrameworksTest()

[ConditionalTheory]
[SkipIfDockerNotRunning]
[InlineData("non-standard-dashboard-port", "mcr.microsoft.com/dotnet/core/aspnet:3.1", 8005)]
[InlineData("non-standard-dashboard-port", "mcr.microsoft.com/dotnet/aspnet:6.0", 8005)]
[InlineData("non-standard-dashboard-port-5.0", "mcr.microsoft.com/dotnet/aspnet:5.0", 8006)]
public async Task RunUsesYamlDashboardPort(string projectName, string baseImage, int expectedDashboardPort)
{
Expand Down Expand Up @@ -1236,7 +1236,7 @@ public async Task RunUsesYamlDashboardPort(string projectName, string baseImage,

[ConditionalTheory]
[SkipIfDockerNotRunning]
[InlineData("non-standard-dashboard-port", "mcr.microsoft.com/dotnet/core/aspnet:3.1", 8005)]
[InlineData("non-standard-dashboard-port", "mcr.microsoft.com/dotnet/aspnet:6.0", 8005)]
[InlineData("non-standard-dashboard-port-5.0", "mcr.microsoft.com/dotnet/aspnet:5.0", 8006)]
public async Task RunCliPortOverridesYamlDashboardPort(string projectName, string baseImage, int tyeYamlDashboardPort)
{
Expand Down
4 changes: 2 additions & 2 deletions test/E2ETest/testassets/projects/frontend-backend/backend/backend-baseimage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<PropertyGroup>
<ContainerBaseImage>mcr.microsoft.com/dotnet/core/sdk</ContainerBaseImage>
<ContainerBaseTag>3.1-buster</ContainerBaseTag>
<ContainerBaseImage>mcr.microsoft.com/dotnet/sdk</ContainerBaseImage>
<ContainerBaseTag>6.0-focal</ContainerBaseTag>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading