test: consolidate the two E2E projects into WopiHost.E2ETests (#548)

The Collabora and ONLYOFFICE e2e projects were near-duplicates: DockerCheck and
PlaywrightFixture were byte-for-byte copies, and the two app fixtures shared the
whole boot-wait-probe-capture skeleton. One project now carries both suites:

- Fixtures/WopiAppFixtureBase absorbs the shared scaffolding (AppHost boot via
  the configureBuilder seam, resource waits, client readiness poll against the
  Aspire-discovered endpoint, RunProcessAsync/docker diagnostics, repo-root
  resolution). Derived fixtures supply only lane specifics: flags, resource
  names, readiness semantics (Collabora: /hosting/discovery 200; ONLYOFFICE:
  /healthcheck body "true"), timeouts, and client-log capture.
- Suites live under Collabora/ and OnlyOffice/, each tagged with a Client trait
  on top of Category=E2E. The nightly workflows run the same project with
  --filter "Client=Collabora" / "Client=OnlyOffice" (the runsettings bypass
  stays; once cleared, the CLI filter applies alone).
- Both collections keep DisableParallelization=true, so an unfiltered local run
  boots the two Aspire stacks sequentially, never concurrently (they pin the
  same host ports).

The repo's "duplicate PlaywrightFixture deliberately" precedent (SmokeTests vs
e2e) doesn't apply between the two e2e suites — they have identical dependency
surfaces — so merging removes real duplication without coupling anything new.
Also halves the per-PR compile cost (one Aspire.Hosting.Testing project in
WOPI.slnx instead of two).

Verified: all three tests pass locally through the exact workflow commands
(Client=Collabora: open + save; Client=OnlyOffice: open).

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>

Author: petrsvihlik

.github/workflows/e2e-collabora.yml

@@ -40,16 +40,16 @@ jobs:
         run: echo "COBALT_PACKAGES_TOKEN=${{ secrets.COBALT_PACKAGES_TOKEN }}" >> $GITHUB_ENV
 
       - name: Restore
-        run: dotnet restore test/WopiHost.E2ETests.Collabora/WopiHost.E2ETests.Collabora.csproj
+        run: dotnet restore test/WopiHost.E2ETests/WopiHost.E2ETests.csproj
 
       - name: Build
-        run: dotnet build test/WopiHost.E2ETests.Collabora/WopiHost.E2ETests.Collabora.csproj --no-restore /p:ContinuousIntegrationBuild=true
+        run: dotnet build test/WopiHost.E2ETests/WopiHost.E2ETests.csproj --no-restore /p:ContinuousIntegrationBuild=true
 
       - name: Install Playwright browsers
         # --with-deps installs the apt packages Chromium needs on a fresh ubuntu-latest. The
         # build emits playwright.ps1 next to the test assembly under artifacts/bin/ (the repo
         # uses UseArtifactsOutput); the path mirrors test/WopiHost.SmokeTests's CI step.
-        run: pwsh artifacts/bin/WopiHost.E2ETests.Collabora/debug/playwright.ps1 install --with-deps chromium
+        run: pwsh artifacts/bin/WopiHost.E2ETests/debug/playwright.ps1 install --with-deps chromium
 
       - name: Pre-pull Collabora image
         # Pre-pulling outside the test makes the test's WaitForResourceHealthyAsync timeout
@@ -61,18 +61,18 @@ jobs:
       - name: Run e2e
         # -p:RunSettingsFilePath= clears the repo-root .runsettings autoloaded via
         # Directory.Build.props. That runsettings filters out Category=E2E so per-PR
-        # `dotnet test` skips this suite; we need to undo that filter for the dedicated
-        # workflow. We do NOT use --filter "Category=E2E" because dotnet test ANDs the CLI
-        # filter with the runsettings filter, yielding (Category!=E2E)&(Category=E2E) which
-        # matches zero tests. Bypassing the runsettings entirely is the cleanest opt-in.
-        run: dotnet test test/WopiHost.E2ETests.Collabora/WopiHost.E2ETests.Collabora.csproj --no-build -p:RunSettingsFilePath= --verbosity normal --logger "console;verbosity=detailed"
+        # `dotnet test` skips this project; the dedicated workflow undoes that and then picks
+        # its suite with the Client trait. The Client filter must NOT be combined with the
+        # runsettings (dotnet test ANDs CLI and runsettings filters — (Category!=E2E)&(...)
+        # matches zero tests); with the runsettings cleared, the CLI filter applies alone.
+        run: dotnet test test/WopiHost.E2ETests/WopiHost.E2ETests.csproj --no-build -p:RunSettingsFilePath= --filter "Client=Collabora" --verbosity normal --logger "console;verbosity=detailed"
 
       - name: Upload Playwright traces on failure
         if: failure()
         uses: actions/upload-artifact@v7
         with:
           name: playwright-traces
           path: |
-            artifacts/bin/WopiHost.E2ETests.Collabora/**/test-results/**
-            artifacts/bin/WopiHost.E2ETests.Collabora/**/playwright-report/**
+            artifacts/bin/WopiHost.E2ETests/**/test-results/**
+            artifacts/bin/WopiHost.E2ETests/**/playwright-report/**
           if-no-files-found: ignore

.github/workflows/e2e-onlyoffice.yml

@@ -41,16 +41,16 @@ jobs:
         run: echo "COBALT_PACKAGES_TOKEN=${{ secrets.COBALT_PACKAGES_TOKEN }}" >> $GITHUB_ENV
 
       - name: Restore
-        run: dotnet restore test/WopiHost.E2ETests.OnlyOffice/WopiHost.E2ETests.OnlyOffice.csproj
+        run: dotnet restore test/WopiHost.E2ETests/WopiHost.E2ETests.csproj
 
       - name: Build
-        run: dotnet build test/WopiHost.E2ETests.OnlyOffice/WopiHost.E2ETests.OnlyOffice.csproj --no-restore /p:ContinuousIntegrationBuild=true
+        run: dotnet build test/WopiHost.E2ETests/WopiHost.E2ETests.csproj --no-restore /p:ContinuousIntegrationBuild=true
 
       - name: Install Playwright browsers
         # --with-deps installs the apt packages Chromium needs on a fresh ubuntu-latest. The build
         # emits playwright.ps1 next to the test assembly under artifacts/bin/ (the repo uses
         # UseArtifactsOutput); the path mirrors the Collabora e2e step.
-        run: pwsh artifacts/bin/WopiHost.E2ETests.OnlyOffice/debug/playwright.ps1 install --with-deps chromium
+        run: pwsh artifacts/bin/WopiHost.E2ETests/debug/playwright.ps1 install --with-deps chromium
 
       - name: Pre-pull ONLYOFFICE image
         # Pre-pulling outside the test makes the fixture's healthcheck timeout bound the runtime cost
@@ -61,17 +61,18 @@ jobs:
       - name: Run e2e
         # -p:RunSettingsFilePath= clears the repo-root .runsettings autoloaded via
         # Directory.Build.props. That runsettings filters out Category=E2E so per-PR `dotnet test`
-        # skips this suite; we undo that filter for the dedicated workflow. We do NOT use
-        # --filter "Category=E2E" because dotnet test ANDs the CLI filter with the runsettings filter,
-        # yielding (Category!=E2E)&(Category=E2E) which matches zero tests.
-        run: dotnet test test/WopiHost.E2ETests.OnlyOffice/WopiHost.E2ETests.OnlyOffice.csproj --no-build -p:RunSettingsFilePath= --verbosity normal --logger "console;verbosity=detailed"
+        # skips this project; the dedicated workflow undoes that and then picks its suite with the
+        # Client trait. The Client filter must NOT be combined with the runsettings (dotnet test
+        # ANDs CLI and runsettings filters — (Category!=E2E)&(...) matches zero tests); with the
+        # runsettings cleared, the CLI filter applies alone.
+        run: dotnet test test/WopiHost.E2ETests/WopiHost.E2ETests.csproj --no-build -p:RunSettingsFilePath= --filter "Client=OnlyOffice" --verbosity normal --logger "console;verbosity=detailed"
 
       - name: Upload Playwright traces on failure
         if: failure()
         uses: actions/upload-artifact@v7
         with:
           name: playwright-traces-onlyoffice
           path: |
-            artifacts/bin/WopiHost.E2ETests.OnlyOffice/**/test-results/**
-            artifacts/bin/WopiHost.E2ETests.OnlyOffice/**/playwright-report/**
+            artifacts/bin/WopiHost.E2ETests/**/test-results/**
+            artifacts/bin/WopiHost.E2ETests/**/playwright-report/**
           if-no-files-found: ignore

.runsettings

@@ -4,15 +4,15 @@
   Directory.Build.props; dotnet test does NOT auto-discover .runsettings by convention.
 
   TestCaseFilter excludes tests carrying the "E2E" trait so plain `dotnet test` skips the
-  Collabora end-to-end suite by default. That suite needs Docker + a real Collabora container
-  cold-start + Playwright; running it on every PR would burn CI minutes and gate PRs on a
-  flaky integration whose failures are mostly upstream.
+  end-to-end suites (Collabora + ONLYOFFICE) by default. Those suites need Docker + a real
+  client-container cold-start + Playwright; running them on every PR would burn CI minutes
+  and gate PRs on flaky integrations whose failures are mostly upstream.
 
   To opt back in for a single run, pass an MSBuild property that clears
   RunSettingsFilePath, which bypasses this file. Be aware that a CLI test filter does NOT
   work as an override here, because dotnet test ANDs the CLI filter with the runsettings
   filter (yielding (Category!=E2E)&(Category=E2E), which matches zero tests).
-  See test/WopiHost.E2ETests.Collabora/README.md for the full local-run command.
+  See test/WopiHost.E2ETests/README.md for the full local-run command.
 -->
 <RunSettings>
   <RunConfiguration>

Directory.Build.props

@@ -20,8 +20,8 @@
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<!-- Auto-load the repo-root .runsettings for `dotnet test`. dotnet test does NOT
 		     auto-discover .runsettings by convention — this property is the documented seam.
-		     The runsettings currently carries a TestCaseFilter that excludes the E2E suite
-		     from default runs; see .runsettings and test/WopiHost.E2ETests.Collabora/README.md. -->
+		     The runsettings currently carries a TestCaseFilter that excludes the E2E suites
+		     from default runs; see .runsettings and test/WopiHost.E2ETests/README.md. -->
 		<RunSettingsFilePath>$(MSBuildThisFileDirectory).runsettings</RunSettingsFilePath>
 	</PropertyGroup>
 

WOPI.slnx

@@ -26,8 +26,7 @@
   <Project Path="test/WopiHost.Core.Tests/WopiHost.Core.Tests.csproj" />
   <Project Path="test/WopiHost.IntegrationTests/WopiHost.IntegrationTests.csproj" />
   <Project Path="test/WopiHost.Discovery.Tests/WopiHost.Discovery.Tests.csproj" />
-  <Project Path="test/WopiHost.E2ETests.Collabora/WopiHost.E2ETests.Collabora.csproj" />
-  <Project Path="test/WopiHost.E2ETests.OnlyOffice/WopiHost.E2ETests.OnlyOffice.csproj" />
+  <Project Path="test/WopiHost.E2ETests/WopiHost.E2ETests.csproj" />
   <Project Path="test/WopiHost.FileSystemProvider.Tests/WopiHost.FileSystemProvider.Tests.csproj" />
   <Project Path="test/WopiHost.MemoryLockProvider.Tests/WopiHost.MemoryLockProvider.Tests.csproj" />
   <Project Path="test/WopiHost.RedisLockProvider.Tests/WopiHost.RedisLockProvider.Tests.csproj" />

infra/WopiHost.AppHost/README.md

@@ -72,12 +72,11 @@ dotnet run --project infra/WopiHost.AppHost -- --AppHost:UseOnlyOffice=false
 ## End-to-end tests
 
 Each lane has a nightly E2E suite that boots this AppHost via `Aspire.Hosting.Testing` and drives the
-editor with Playwright:
+editor with Playwright. Both live in [`test/WopiHost.E2ETests`](../../test/WopiHost.E2ETests) (one
+project, suites selected by a `Client` trait):
 
-- [`test/WopiHost.E2ETests.Collabora`](../../test/WopiHost.E2ETests.Collabora) →
-  [`e2e-collabora.yml`](../../.github/workflows/e2e-collabora.yml)
-- [`test/WopiHost.E2ETests.OnlyOffice`](../../test/WopiHost.E2ETests.OnlyOffice) →
-  [`e2e-onlyoffice.yml`](../../.github/workflows/e2e-onlyoffice.yml)
+- [`e2e-collabora.yml`](../../.github/workflows/e2e-collabora.yml) → `--filter "Client=Collabora"`
+- [`e2e-onlyoffice.yml`](../../.github/workflows/e2e-onlyoffice.yml) → `--filter "Client=OnlyOffice"`
 
 Neither gates per-PR CI (they're `[Trait("Category", "E2E")]`, filtered out by the repo-root
 `.runsettings`); they run on a nightly cron + `workflow_dispatch`.