Clean up test project

mingyaulee · Sep 18, 2024 · daf6f5f · daf6f5f
1 parent c2da6e7
commit daf6f5f
Show file tree

Hide file tree

Showing 38 changed files with 90 additions and 1,159 deletions.
diff --git a/WebExtensions.Net.sln b/WebExtensions.Net.sln
@@ -27,6 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{37728F80-FC9
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tool", "tool", "{4C80786C-7306-4DCC-A96F-9305D50DF7D5}"
  ProjectSection(SolutionItems) = preProject
+ tool\DependenciesUpdater.ps1 = tool\DependenciesUpdater.ps1
  tool\LanguageCodeUpdater.ps1 = tool\LanguageCodeUpdater.ps1
  EndProjectSection
 EndProject

diff --git a/test/WebExtensions.Net.BrowserExtensionIntegrationTest/App.razor b/test/WebExtensions.Net.BrowserExtensionIntegrationTest/App.razor
@@ -1,10 +1,10 @@
-<Router AppAssembly="@typeof(Program).Assembly" PreferExactMatches="@true">
+<Router AppAssembly="@typeof(Program).Assembly" PreferExactMatches="@true">
  <Found Context="routeData">
- <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+ <RouteView RouteData="@routeData" />
  </Found>
  <NotFound>
- <LayoutView Layout="@typeof(MainLayout)">
+ <LayoutView>
  <p>Sorry, there's nothing at this address.</p>
  </LayoutView>
  </NotFound>
-</Router>
+</Router>
diff --git a/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Pages/Counter.razor b/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Pages/Counter.razor
diff --git a/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Pages/FetchData.razor b/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Pages/FetchData.razor
diff --git a/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Pages/Index.razor b/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Pages/Index.razor
diff --git a/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Pages/Options.razor b/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Pages/Options.razor
diff --git a/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Pages/Tests.razor b/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Pages/Tests.razor
@@ -1,6 +1,5 @@
 @page "/tests.html"
 @using WebExtensions.Net.BrowserExtensionIntegrationTest.Infrastructure
-@inherits Blazor.BrowserExtension.Pages.BasePage
 @inject NavigationManager NavigationManager
 
 @code {

diff --git a/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Program.cs b/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Program.cs
@@ -1,7 +1,5 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Net.Http;
 using System.Threading.Tasks;
 using WebExtensions.Net.BrowserExtensionIntegrationTest.Infrastructure;
 
@@ -14,8 +12,7 @@ public static async Task Main(string[] args)
  var builder = WebAssemblyHostBuilder.CreateDefault(args);
  builder.RootComponents.Add<App>("#app");
 
- builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
- builder.Services.AddBrowserExtensionServices();
+ builder.Services.AddWebExtensions();
  builder.Services.AddScoped<ITestFactory, TestFactory>();
  builder.Services.AddScoped<ITestRunner, TestRunner>();
 

diff --git a/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Shared/MainLayout.razor b/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Shared/MainLayout.razor
diff --git a/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Shared/MainLayout.razor.css b/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Shared/MainLayout.razor.css
diff --git a/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Shared/NavMenu.razor b/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Shared/NavMenu.razor
diff --git a/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Shared/NavMenu.razor.css b/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Shared/NavMenu.razor.css
diff --git a/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Shared/SurveyPrompt.razor b/test/WebExtensions.Net.BrowserExtensionIntegrationTest/Shared/SurveyPrompt.razor
diff --git a/....BrowserExtensionIntegrationTest/WebExtensions.Net.BrowserExtensionIntegrationTest.csproj b/....BrowserExtensionIntegrationTest/WebExtensions.Net.BrowserExtensionIntegrationTest.csproj
@@ -8,19 +8,14 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Blazor.BrowserExtension" Version="1.3.0" />
- <PackageReference Include="FluentAssertions" Version="6.12.0" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.5" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.5" PrivateAssets="all" />
- <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
+ <PackageReference Include="Blazor.BrowserExtension.Build" Version="2.0.0" />
+ <PackageReference Include="FluentAssertions" Version="6.12.1" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.8" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.8" PrivateAssets="all" />
  </ItemGroup>
 
  <ItemGroup>
- <None Include="wwwroot\**\*" CopyToOutputDirectory="Always" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\..\src\WebExtensions.Net\WebExtensions.Net.csproj" />
+ <ProjectReference Include="..\..\src\WebExtensions.Net.Extensions.DependencyInjection\WebExtensions.Net.Extensions.DependencyInjection.csproj" />
  </ItemGroup>
 
 </Project>
diff --git a/test/WebExtensions.Net.BrowserExtensionIntegrationTest/_Imports.razor b/test/WebExtensions.Net.BrowserExtensionIntegrationTest/_Imports.razor
@@ -8,4 +8,3 @@
 @using Microsoft.JSInterop
 @using WebExtensions.Net.BrowserExtensionIntegrationTest
 @using WebExtensions.Net.BrowserExtensionIntegrationTest.Models
-@using WebExtensions.Net.BrowserExtensionIntegrationTest.Shared
diff --git a/test/WebExtensions.Net.BrowserExtensionIntegrationTest/wwwroot/BackgroundWorker.js b/test/WebExtensions.Net.BrowserExtensionIntegrationTest/wwwroot/BackgroundWorker.js
@@ -1,5 +1,5 @@
 // Import for the side effect of defining a global 'browser' variable
-import * as _ from "/content/Blazor.BrowserExtension/lib/browser-polyfill.min.js";
+import * as _ from "/js/browser-polyfill.min.js";
 
 browser.runtime.onInstalled.addListener(() => {
  const indexPageUrl = browser.runtime.getURL("options.html");