diff --git a/backend/src/Squidex/Squidex.csproj b/backend/src/Squidex/Squidex.csproj
index 127746983..0103363e5 100644
--- a/backend/src/Squidex/Squidex.csproj
+++ b/backend/src/Squidex/Squidex.csproj
@@ -60,7 +60,7 @@
-
+
@@ -74,16 +74,16 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
diff --git a/backend/tests/docker-compose.yml b/backend/tests/docker-compose.yml
index 2ddce960c..17e652353 100644
--- a/backend/tests/docker-compose.yml
+++ b/backend/tests/docker-compose.yml
@@ -3,18 +3,17 @@ services:
mongo:
image: mongo:latest
ports:
- - "27018:27017"
+ - "27019:27017"
networks:
- internal
- squidex:
+ squidex1:
image: squidex
- ports:
- - "8080:80"
environment:
- URLS__BASEURL=http://localhost:8080
- ASSETS__RESIZERURL=http://resizer
- EVENTSTORE__MONGODB__CONFIGURATION=mongodb://mongo
+ - EVENTSTORE__MONGODB__DATABASE=squidex1
- GRAPHQL__CACHEDURATION=0
- IDENTITY__ADMINCLIENTID=root
- IDENTITY__ADMINCLIENTSECRET=xeLd6jFxqbXJrfmNLlO2j1apagGGGSyZJhFnIuHp4I0=
@@ -22,8 +21,36 @@ services:
- SCRIPTING__TIMEOUTEXECUTION=00:00:10
- SCRIPTING__TIMEOUTSCRIPT=00:00:10
- STORE__MONGODB__CONFIGURATION=mongodb://mongo
+ - STORE__MONGODB__DATABASE=squidex1
+ - STORE__MONGODB__CONTENTDATABASE=squidex1_content
- STORE__TYPE=MongoDB
- - TEMPLATES__LOCALURL=http://localhost:80
+ - TEMPLATES__LOCALURL=http://localhost:5000
+ - ASPNETCORE_URLS=http://+:5000
+ networks:
+ - internal
+ depends_on:
+ - mongo
+
+ squidex2:
+ image: squidex
+ environment:
+ - URLS__BASEURL=http://localhost:8081/squidex/
+ - URLS__BASEPATH=squidex/
+ - ASSETS__RESIZERURL=http://resizer
+ - EVENTSTORE__MONGODB__CONFIGURATION=mongodb://mongo
+ - EVENTSTORE__MONGODB__DATABASE=squidex2
+ - GRAPHQL__CACHEDURATION=0
+ - IDENTITY__ADMINCLIENTID=root
+ - IDENTITY__ADMINCLIENTSECRET=xeLd6jFxqbXJrfmNLlO2j1apagGGGSyZJhFnIuHp4I0=
+ - IDENTITY__MULTIPLEDOMAINS=true
+ - SCRIPTING__TIMEOUTEXECUTION=00:00:10
+ - SCRIPTING__TIMEOUTSCRIPT=00:00:10
+ - STORE__MONGODB__CONFIGURATION=mongodb://mongo
+ - STORE__MONGODB__DATABASE=squidex2
+ - STORE__MONGODB__CONTENTDATABASE=squidex2_content
+ - STORE__TYPE=MongoDB
+ - TEMPLATES__LOCALURL=http://localhost:5000
+ - ASPNETCORE_URLS=http://+:5000
networks:
- internal
depends_on:
@@ -31,12 +58,38 @@ services:
resizer:
image: squidex/resizer:dev-40
- ports:
- - "8081:80"
networks:
- internal
depends_on:
- mongo
+
+ squidex_proxy1:
+ image: squidex/caddy-proxy
+ ports:
+ - "8080:8080"
+ environment:
+ - SITE_ADDRESS=http://localhost:8080
+ - SITE_PATH=*
+ - SITE_SERVER="squidex1:5000"
+ depends_on:
+ - squidex1
+ networks:
+ - internal
+ restart: unless-stopped
+
+ squidex_proxy2:
+ image: squidex/caddy-proxy-path
+ ports:
+ - "8081:8081"
+ environment:
+ - SITE_ADDRESS=http://localhost:8081
+ - SITE_PATH=/squidex/*
+ - SITE_SERVER="squidex2:5000"
+ depends_on:
+ - squidex2
+ networks:
+ - internal
+ restart: unless-stopped
networks:
internal:
diff --git a/backend/tools/TestSuite/TestSuite.ApiTests/AssetFixture.cs b/backend/tools/TestSuite/TestSuite.ApiTests/AssetFixture.cs
index f709a6d15..ffc6fecfe 100644
--- a/backend/tools/TestSuite/TestSuite.ApiTests/AssetFixture.cs
+++ b/backend/tools/TestSuite/TestSuite.ApiTests/AssetFixture.cs
@@ -20,7 +20,7 @@ namespace TestSuite.ApiTests
{
client.BaseAddress = new Uri(ServerUrl);
- var url = asset._links["content"].Href;
+ var url = asset._links["content"].Href[1..];
if (version > 0)
{
diff --git a/backend/tools/TestSuite/TestSuite.ApiTests/Assets/Frontend_Home.jpg b/backend/tools/TestSuite/TestSuite.ApiTests/Assets/Frontend_Home.jpg
new file mode 100644
index 000000000..2676c4fb6
Binary files /dev/null and b/backend/tools/TestSuite/TestSuite.ApiTests/Assets/Frontend_Home.jpg differ
diff --git a/backend/tools/TestSuite/TestSuite.ApiTests/Assets/Frontend_Login.jpg b/backend/tools/TestSuite/TestSuite.ApiTests/Assets/Frontend_Login.jpg
new file mode 100644
index 000000000..380a3bb16
Binary files /dev/null and b/backend/tools/TestSuite/TestSuite.ApiTests/Assets/Frontend_Login.jpg differ
diff --git a/backend/tools/TestSuite/TestSuite.ApiTests/FrontendTests.cs b/backend/tools/TestSuite/TestSuite.ApiTests/FrontendTests.cs
new file mode 100644
index 000000000..4acaa138c
--- /dev/null
+++ b/backend/tools/TestSuite/TestSuite.ApiTests/FrontendTests.cs
@@ -0,0 +1,62 @@
+// ==========================================================================
+// Squidex Headless CMS
+// ==========================================================================
+// Copyright (c) Squidex UG (haftungsbeschraenkt)
+// All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using Codeuctivity.ImageSharpCompare;
+using PuppeteerSharp;
+using TestSuite.Fixtures;
+using Xunit;
+
+#pragma warning disable SA1300 // Element should begin with upper-case letter
+
+namespace TestSuite.ApiTests
+{
+ public sealed class FrontendTests : IClassFixture
+ {
+ public ClientFixture _ { get; }
+
+ public FrontendTests(ClientFixture fixture)
+ {
+ _ = fixture;
+ }
+
+ [Theory]
+ [InlineData("Frontend_Home", "")]
+ [InlineData("Frontend_Login", "identity-server/account/login")]
+ public async Task Should_render_properly(string name, string url)
+ {
+ using (var browserFetcher = new BrowserFetcher())
+ {
+ await browserFetcher.DownloadAsync();
+ }
+
+ await using var browser = await Puppeteer.LaunchAsync(new LaunchOptions
+ {
+ Headless = true,
+ DefaultViewport = new ViewPortOptions
+ {
+ Height = 800,
+ IsLandscape = true,
+ IsMobile = false,
+ Width = 1000
+ },
+ Args = new string[]
+ {
+ "--no-sandbox"
+ }
+ });
+
+ await using var page = await browser.NewPageAsync();
+
+ await page.GoToAsync(_.ClientManager.Options.Url + url + "?skip-setup");
+ await page.ScreenshotAsync($"__{name}.jpg");
+
+ var diff = ImageSharpCompare.CalcDiff($"__{name}.jpg", $"Assets/{name}.jpg");
+
+ Assert.InRange(diff.MeanError, 0, 10);
+ }
+ }
+}
diff --git a/backend/tools/TestSuite/TestSuite.ApiTests/GraphQLTests.cs b/backend/tools/TestSuite/TestSuite.ApiTests/GraphQLTests.cs
index 5358d23a3..615efa372 100644
--- a/backend/tools/TestSuite/TestSuite.ApiTests/GraphQLTests.cs
+++ b/backend/tools/TestSuite/TestSuite.ApiTests/GraphQLTests.cs
@@ -105,6 +105,14 @@ namespace TestSuite.ApiTests
try
{
await CreateSchemasAsync();
+ }
+ catch
+ {
+ // Do nothing
+ }
+
+ try
+ {
await CreateContentsAsync();
}
catch
diff --git a/backend/tools/TestSuite/TestSuite.ApiTests/TestSuite.ApiTests.csproj b/backend/tools/TestSuite/TestSuite.ApiTests/TestSuite.ApiTests.csproj
index 0a7612c2a..92d0429ed 100644
--- a/backend/tools/TestSuite/TestSuite.ApiTests/TestSuite.ApiTests.csproj
+++ b/backend/tools/TestSuite/TestSuite.ApiTests/TestSuite.ApiTests.csproj
@@ -14,12 +14,14 @@
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
+
@@ -35,6 +37,12 @@
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest
diff --git a/backend/tools/TestSuite/TestSuite.Shared/TestSuite.Shared.csproj b/backend/tools/TestSuite/TestSuite.Shared/TestSuite.Shared.csproj
index 7d3009b94..9be865dad 100644
--- a/backend/tools/TestSuite/TestSuite.Shared/TestSuite.Shared.csproj
+++ b/backend/tools/TestSuite/TestSuite.Shared/TestSuite.Shared.csproj
@@ -16,7 +16,7 @@
-
+
+ })
