diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorServerTemplateTest.cs b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorServerTemplateTest.cs index b59787790c8c..58e9701be946 100644 --- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorServerTemplateTest.cs +++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorServerTemplateTest.cs @@ -25,9 +25,8 @@ public BlazorServerTemplateTest(ProjectFactoryFixture projectFactory) public override string ProjectType { get; } = "blazorserver"; - [Theory] + [Theory(Skip = "https://github.com/dotnet/aspnetcore/issues/30761")] [InlineData(BrowserKind.Chromium)] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/30761")] public async Task BlazorServerTemplateWorks_NoAuth(BrowserKind browserKind) { var project = await CreateBuildPublishAsync("blazorservernoauth" + browserKind); @@ -81,9 +80,8 @@ await BrowserManager.GetBrowserInstance(browserKind, BrowserContextInfo) : public static IEnumerable BlazorServerTemplateWorks_IndividualAuthData => BrowserManager.WithBrowsers(new[] { BrowserKind.Chromium }, true, false); - [Theory] + [Theory(Skip = "https://github.com/dotnet/aspnetcore/issues/30882")] [MemberData(nameof(BlazorServerTemplateWorks_IndividualAuthData))] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/30882")] [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/30825", Queues = "All.OSX")] public async Task BlazorServerTemplateWorks_IndividualAuth(BrowserKind browserKind, bool useLocalDB) { @@ -182,13 +180,12 @@ private async Task TestBasicNavigation(Project project, IPage page) Assert.Equal(5, await page.Locator("p+table>tbody>tr").CountAsync()); } - [Theory] + [Theory(Skip = "https://github.com/dotnet/aspnetcore/issues/30882")] [InlineData("IndividualB2C", null)] [InlineData("IndividualB2C", new string[] { "--called-api-url \"https://graph.microsoft.com\"", "--called-api-scopes user.readwrite" })] [InlineData("SingleOrg", null)] [InlineData("SingleOrg", new string[] { "--called-api-url \"https://graph.microsoft.com\"", "--called-api-scopes user.readwrite" })] [InlineData("SingleOrg", new string[] { "--calls-graph" })] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/30882")] public Task BlazorServerTemplate_IdentityWeb_BuildAndPublish(string auth, string[] args) => CreateBuildPublishAsync("blazorserveridweb" + Guid.NewGuid().ToString().Substring(0, 10).ToLowerInvariant(), auth, args); diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs index 0077e9f35471..75107526b6c8 100644 --- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs +++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs @@ -23,9 +23,8 @@ public BlazorWasmTemplateTest(ProjectFactoryFixture projectFactory) public override string ProjectType { get; } = "blazorwasm"; - [Theory] + [Theory(Skip = "https://github.com/dotnet/aspnetcore/issues/30882")] [InlineData(BrowserKind.Chromium)] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/30882")] public async Task BlazorWasmStandaloneTemplate_Works(BrowserKind browserKind) { var project = await CreateBuildPublishAsync("blazorstandalone" + browserKind); @@ -60,9 +59,8 @@ private static async Task NavigateToPage(IBrowserContext browser, string return page; } - [Theory] + [Theory(Skip = "https://github.com/dotnet/aspnetcore/issues/30882")] [InlineData(BrowserKind.Chromium)] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/30882")] public async Task BlazorWasmHostedTemplate_Works(BrowserKind browserKind) { var project = await CreateBuildPublishAsync("blazorhosted" + BrowserKind.Chromium, args: new[] { "--hosted" }, serverProject: true); @@ -109,9 +107,8 @@ private static async Task AssertCompressionFormat(AspNetProcess aspNetProcess, s Assert.Equal(expectedEncoding, response.Content.Headers.ContentEncoding.Single()); } - [Theory] + [Theory(Skip = "https://github.com/dotnet/aspnetcore/issues/30882")] [InlineData(BrowserKind.Chromium)] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/30882")] public async Task BlazorWasmStandalonePwaTemplate_Works(BrowserKind browserKind) { var project = await CreateBuildPublishAsync("blazorstandalonepwa", args: new[] { "--pwa" }); @@ -145,9 +142,8 @@ public async Task BlazorWasmStandalonePwaTemplate_Works(BrowserKind browserKind) } } - [Theory] + [Theory(Skip = "https://github.com/dotnet/aspnetcore/issues/30882")] [InlineData(BrowserKind.Chromium)] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/30882")] public async Task BlazorWasmHostedPwaTemplate_Works(BrowserKind browserKind) { var project = await CreateBuildPublishAsync("blazorhostedpwa", args: new[] { "--hosted", "--pwa" }, serverProject: true); @@ -216,18 +212,16 @@ private static void ValidatePublishedServiceWorker(Project project) Assert.True(serviceWorkerContents.Contains($"/* Manifest version: {serviceWorkerAssetsManifestVersion} */", StringComparison.Ordinal)); } - [ConditionalTheory] + [ConditionalTheory(Skip = "https://github.com/dotnet/aspnetcore/issues/30882")] [InlineData(BrowserKind.Chromium)] // LocalDB doesn't work on non Windows platforms [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/30882")] public Task BlazorWasmHostedTemplate_IndividualAuth_Works_WithLocalDB(BrowserKind browserKind) => BlazorWasmHostedTemplate_IndividualAuth_Works(browserKind, true); // This test depends on BlazorWasmTemplate_CreateBuildPublish_IndividualAuthNoLocalDb running first - [Theory] + [Theory(Skip = "https://github.com/dotnet/aspnetcore/issues/30882")] [InlineData(BrowserKind.Chromium)] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/30882")] [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/30825", Queues = "All.OSX")] public Task BlazorWasmHostedTemplate_IndividualAuth_Works_WithOutLocalDB(BrowserKind browserKind) => BlazorWasmHostedTemplate_IndividualAuth_Works(browserKind, false); @@ -379,9 +373,8 @@ public TemplateInstance(string name, params string[] arguments) public string[] Arguments { get; } } - [Theory] + [Theory(Skip = "https://github.com/dotnet/aspnetcore/issues/37782")] [MemberData(nameof(TemplateData))] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/37782")] public Task BlazorWasmHostedTemplate_AzureActiveDirectoryTemplate_Works(TemplateInstance instance) => CreateBuildPublishAsync(instance.Name, args: instance.Arguments, targetFramework: "netstandard2.1");