Skip to content

Commit b259883

Browse files
toniarnoldtoniarnold
committed
Add VS Test Explorer test runners for Blazor
The test runners for Blazor are now working (after the change of starting the .NET Core Web Server with "dotnet run" in the application directory instead of the .exe directly). Fix remaining SQL Server connection strings for .NET 6
1 parent ff93c5c commit b259883

File tree

24 files changed

+260
-24
lines changed

24 files changed

+260
-24
lines changed

Diff for: ‎asp.blazor.sln

+14
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iselenium.blazor", "src\ise
2727
EndProject
2828
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "asptest.blazor.bunit", "src\asptest.blazor.bunit\asptest.blazor.bunit.csproj", "{CF3AD587-533F-4944-A47E-213AE41F4DF6}"
2929
EndProject
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "asptestrunner.blazor", "src\asptestrunner.blazor\asptestrunner.blazor.csproj", "{64259526-AEED-485B-9824-14C19ED16915}"
31+
EndProject
3032
Global
3133
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3234
Debug|Any CPU = Debug|Any CPU
@@ -181,6 +183,18 @@ Global
181183
{CF3AD587-533F-4944-A47E-213AE41F4DF6}.Release|x64.Build.0 = Release|Any CPU
182184
{CF3AD587-533F-4944-A47E-213AE41F4DF6}.Release|x86.ActiveCfg = Release|Any CPU
183185
{CF3AD587-533F-4944-A47E-213AE41F4DF6}.Release|x86.Build.0 = Release|Any CPU
186+
{64259526-AEED-485B-9824-14C19ED16915}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
187+
{64259526-AEED-485B-9824-14C19ED16915}.Debug|Any CPU.Build.0 = Debug|Any CPU
188+
{64259526-AEED-485B-9824-14C19ED16915}.Debug|x64.ActiveCfg = Debug|Any CPU
189+
{64259526-AEED-485B-9824-14C19ED16915}.Debug|x64.Build.0 = Debug|Any CPU
190+
{64259526-AEED-485B-9824-14C19ED16915}.Debug|x86.ActiveCfg = Debug|Any CPU
191+
{64259526-AEED-485B-9824-14C19ED16915}.Debug|x86.Build.0 = Debug|Any CPU
192+
{64259526-AEED-485B-9824-14C19ED16915}.Release|Any CPU.ActiveCfg = Release|Any CPU
193+
{64259526-AEED-485B-9824-14C19ED16915}.Release|Any CPU.Build.0 = Release|Any CPU
194+
{64259526-AEED-485B-9824-14C19ED16915}.Release|x64.ActiveCfg = Release|Any CPU
195+
{64259526-AEED-485B-9824-14C19ED16915}.Release|x64.Build.0 = Release|Any CPU
196+
{64259526-AEED-485B-9824-14C19ED16915}.Release|x86.ActiveCfg = Release|Any CPU
197+
{64259526-AEED-485B-9824-14C19ED16915}.Release|x86.Build.0 = Release|Any CPU
184198
EndGlobalSection
185199
GlobalSection(SolutionProperties) = preSolution
186200
HideSolutionNode = FALSE

Diff for: ‎aspnettest.sln

+52
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrunner.sm", "src\iselen
134134
EndProject
135135
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "asptest.blazor.bunit", "src\asptest.blazor.bunit\asptest.blazor.bunit.csproj", "{0B3526A5-64EA-4B61-82E5-E6062DF892A4}"
136136
EndProject
137+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "minimaltestrunner.blazor", "src\minimaltestrunner.blazor\minimaltestrunner.blazor.csproj", "{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}"
138+
EndProject
139+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "asptestrunner.blazor", "src\asptestrunner.blazor\asptestrunner.blazor.csproj", "{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}"
140+
EndProject
137141
Global
138142
GlobalSection(SolutionConfigurationPlatforms) = preSolution
139143
Debug|Any CPU = Debug|Any CPU
@@ -1446,6 +1450,54 @@ Global
14461450
{0B3526A5-64EA-4B61-82E5-E6062DF892A4}.ReleaseNoTrace|x64.Build.0 = Release|Any CPU
14471451
{0B3526A5-64EA-4B61-82E5-E6062DF892A4}.ReleaseNoTrace|x86.ActiveCfg = Release|Any CPU
14481452
{0B3526A5-64EA-4B61-82E5-E6062DF892A4}.ReleaseNoTrace|x86.Build.0 = Release|Any CPU
1453+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1454+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.Debug|Any CPU.Build.0 = Debug|Any CPU
1455+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.Debug|x64.ActiveCfg = Debug|Any CPU
1456+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.Debug|x64.Build.0 = Debug|Any CPU
1457+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.Debug|x86.ActiveCfg = Debug|Any CPU
1458+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.Debug|x86.Build.0 = Debug|Any CPU
1459+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.DebugNoTrace|Any CPU.ActiveCfg = Debug|Any CPU
1460+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.DebugNoTrace|Any CPU.Build.0 = Debug|Any CPU
1461+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.DebugNoTrace|x64.ActiveCfg = Debug|Any CPU
1462+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.DebugNoTrace|x64.Build.0 = Debug|Any CPU
1463+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.DebugNoTrace|x86.ActiveCfg = Debug|Any CPU
1464+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.DebugNoTrace|x86.Build.0 = Debug|Any CPU
1465+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.Release|Any CPU.ActiveCfg = Release|Any CPU
1466+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.Release|Any CPU.Build.0 = Release|Any CPU
1467+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.Release|x64.ActiveCfg = Release|Any CPU
1468+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.Release|x64.Build.0 = Release|Any CPU
1469+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.Release|x86.ActiveCfg = Release|Any CPU
1470+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.Release|x86.Build.0 = Release|Any CPU
1471+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.ReleaseNoTrace|Any CPU.ActiveCfg = Release|Any CPU
1472+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.ReleaseNoTrace|Any CPU.Build.0 = Release|Any CPU
1473+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.ReleaseNoTrace|x64.ActiveCfg = Release|Any CPU
1474+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.ReleaseNoTrace|x64.Build.0 = Release|Any CPU
1475+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.ReleaseNoTrace|x86.ActiveCfg = Release|Any CPU
1476+
{4AD8FE84-E4C5-4591-9BA9-9B6D1B31B833}.ReleaseNoTrace|x86.Build.0 = Release|Any CPU
1477+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1478+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.Debug|Any CPU.Build.0 = Debug|Any CPU
1479+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.Debug|x64.ActiveCfg = Debug|Any CPU
1480+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.Debug|x64.Build.0 = Debug|Any CPU
1481+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.Debug|x86.ActiveCfg = Debug|Any CPU
1482+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.Debug|x86.Build.0 = Debug|Any CPU
1483+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.DebugNoTrace|Any CPU.ActiveCfg = Debug|Any CPU
1484+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.DebugNoTrace|Any CPU.Build.0 = Debug|Any CPU
1485+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.DebugNoTrace|x64.ActiveCfg = Debug|Any CPU
1486+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.DebugNoTrace|x64.Build.0 = Debug|Any CPU
1487+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.DebugNoTrace|x86.ActiveCfg = Debug|Any CPU
1488+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.DebugNoTrace|x86.Build.0 = Debug|Any CPU
1489+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.Release|Any CPU.ActiveCfg = Release|Any CPU
1490+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.Release|Any CPU.Build.0 = Release|Any CPU
1491+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.Release|x64.ActiveCfg = Release|Any CPU
1492+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.Release|x64.Build.0 = Release|Any CPU
1493+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.Release|x86.ActiveCfg = Release|Any CPU
1494+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.Release|x86.Build.0 = Release|Any CPU
1495+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.ReleaseNoTrace|Any CPU.ActiveCfg = Release|Any CPU
1496+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.ReleaseNoTrace|Any CPU.Build.0 = Release|Any CPU
1497+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.ReleaseNoTrace|x64.ActiveCfg = Release|Any CPU
1498+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.ReleaseNoTrace|x64.Build.0 = Release|Any CPU
1499+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.ReleaseNoTrace|x86.ActiveCfg = Release|Any CPU
1500+
{77CF1CB2-A665-4EF1-A0D0-484290A0CB49}.ReleaseNoTrace|x86.Build.0 = Release|Any CPU
14491501
EndGlobalSection
14501502
GlobalSection(SolutionProperties) = preSolution
14511503
HideSolutionNode = FALSE

Diff for: ‎minimal.blazor.sln

+14
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doc", "doc\doc.vcxproj", "{
2121
EndProject
2222
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iselenium.blazor", "src\iselenium.blazor\iselenium.blazor.csproj", "{AA25DDB7-3A64-478F-B04F-EB6C9D5ACE6C}"
2323
EndProject
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "minimaltestrunner.blazor", "src\minimaltestrunner.blazor\minimaltestrunner.blazor.csproj", "{89E3E911-D34A-4A19-9BC7-C888DA22C7F5}"
25+
EndProject
2426
Global
2527
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2628
Debug|Any CPU = Debug|Any CPU
@@ -139,6 +141,18 @@ Global
139141
{AA25DDB7-3A64-478F-B04F-EB6C9D5ACE6C}.Release|x64.Build.0 = Release|Any CPU
140142
{AA25DDB7-3A64-478F-B04F-EB6C9D5ACE6C}.Release|x86.ActiveCfg = Release|Any CPU
141143
{AA25DDB7-3A64-478F-B04F-EB6C9D5ACE6C}.Release|x86.Build.0 = Release|Any CPU
144+
{89E3E911-D34A-4A19-9BC7-C888DA22C7F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
145+
{89E3E911-D34A-4A19-9BC7-C888DA22C7F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
146+
{89E3E911-D34A-4A19-9BC7-C888DA22C7F5}.Debug|x64.ActiveCfg = Debug|Any CPU
147+
{89E3E911-D34A-4A19-9BC7-C888DA22C7F5}.Debug|x64.Build.0 = Debug|Any CPU
148+
{89E3E911-D34A-4A19-9BC7-C888DA22C7F5}.Debug|x86.ActiveCfg = Debug|Any CPU
149+
{89E3E911-D34A-4A19-9BC7-C888DA22C7F5}.Debug|x86.Build.0 = Debug|Any CPU
150+
{89E3E911-D34A-4A19-9BC7-C888DA22C7F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
151+
{89E3E911-D34A-4A19-9BC7-C888DA22C7F5}.Release|Any CPU.Build.0 = Release|Any CPU
152+
{89E3E911-D34A-4A19-9BC7-C888DA22C7F5}.Release|x64.ActiveCfg = Release|Any CPU
153+
{89E3E911-D34A-4A19-9BC7-C888DA22C7F5}.Release|x64.Build.0 = Release|Any CPU
154+
{89E3E911-D34A-4A19-9BC7-C888DA22C7F5}.Release|x86.ActiveCfg = Release|Any CPU
155+
{89E3E911-D34A-4A19-9BC7-C888DA22C7F5}.Release|x86.Build.0 = Release|Any CPU
142156
EndGlobalSection
143157
GlobalSection(SolutionProperties) = preSolution
144158
HideSolutionNode = FALSE

Diff for: ‎src/asp.blazor/appsettings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"DatabaseStorageExpires": "1",
1111
"EncryptDatabaseStorage": "False",
1212
"EncryptViewStateKey": "<-- secret w/o server affinity -->",
13-
"ASP_DBEntities": "Data Source=(local);Initial Catalog=ASP_DB;Persist Security Info=True;User ID=iis;Password=pass;multipleactiveresultsets=True;",
13+
"ASP_DBEntities": "Data Source=(local);Initial Catalog=ASP_DB;Persist Security Info=True;User ID=iis;Password=pass;multipleactiveresultsets=True;TrustServerCertificate=true;",
1414
"RequestTimeout": "5",
1515
"asptest.CalculatorTest.FibonacciTest": "45aff7ba-2137-4cef-1997-08da438d667f",
1616
"TestFilterWhere": ""

Diff for: ‎src/asp.core/appsettings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"RequestTimeout": "5",
77
"IEVisible": "False",
88
"TestFilterWhere": "",
9-
"ASP_DBEntities": "Data Source=(local);Initial Catalog=ASP_DB;Persist Security Info=True;User ID=iis;Password=pass;multipleactiveresultsets=True;",
9+
"ASP_DBEntities": "Data Source=(local);Initial Catalog=ASP_DB;Persist Security Info=True;User ID=iis;Password=pass;multipleactiveresultsets=True;TrustServerCertificate=true;",
1010
"asptest.Calculator.FibonacciTest": "131C17EF-EA02-48B5-A199-D12605CB8778"
1111
}

Diff for: ‎src/asp.websharper.spa.fs/appsettings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"EncryptViewStateKey": "<-- secret w/o server affinity -->",
66
"RequestTimeout": "10",
77
"TestFilterWhere": "",
8-
"ASP_DBEntities": "Data Source=(local);Initial Catalog=ASP_DB;Persist Security Info=True;User ID=iis;Password=pass;multipleactiveresultsets=True;",
8+
"ASP_DBEntities": "Data Source=(local);Initial Catalog=ASP_DB;Persist Security Info=True;User ID=iis;Password=pass;multipleactiveresultsets=True;TrustServerCertificate=true;",
99
"asptest.Calculator.FibonacciTest": "5EC80614-B765-4281-3481-08D80B9F50D6"
1010
}

Diff for: ‎src/asp.websharper.spa/appsettings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"EncryptViewStateKey": "<-- secret w/o server affinity -->",
66
"RequestTimeout": "10",
77
"TestFilterWhere": "",
8-
"ASP_DBEntities": "Data Source=(local);Initial Catalog=ASP_DB;Persist Security Info=True;User ID=iis;Password=pass;multipleactiveresultsets=True;",
8+
"ASP_DBEntities": "Data Source=(local);Initial Catalog=ASP_DB;Persist Security Info=True;User ID=iis;Password=pass;multipleactiveresultsets=True;TrustServerCertificate=true;",
99
"asptest.Calculator.FibonacciTest": "5EC80614-B765-4281-3481-08D80B9F50D6"
1010
}

Diff for: ‎src/asplib.core/Model/StorageImplementation.cs

+4
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,10 @@ public static (byte[] bytes, Func<byte[], byte[]> filter) DatabaseBytes(
228228
{
229229
bytes = db.LoadMain(session);
230230
}
231+
if (bytes == null)
232+
{
233+
throw new ArgumentException($"No data for session={session}");
234+
}
231235
return (bytes, filter);
232236
}
233237

Diff for: ‎src/asptestrunner.blazor/Runner.cs

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
using iselenium;
2+
using NUnit.Framework;
3+
using OpenQA.Selenium.Edge;
4+
using System.Collections.Generic;
5+
using System.Diagnostics;
6+
7+
namespace asptestrunner
8+
{
9+
[TestFixture]
10+
[Category("ITestServer")]
11+
public class Runner : SeleniumTest<EdgeDriver>, ITestServer
12+
{
13+
public List<Process> ServerProcesses { get; set; }
14+
15+
[SetUp]
16+
public void SetUp()
17+
{
18+
this.StartServer();
19+
}
20+
21+
[TearDown]
22+
public void TearDown()
23+
{
24+
this.StopServer();
25+
}
26+
27+
[Test]
28+
public void RunTests()
29+
{
30+
this.Navigate("/", pause: 200); // allow the testButton time to render
31+
this.ClickID("testButton");
32+
this.AssertTestsOK();
33+
}
34+
}
35+
}

Diff for: ‎src/asptestrunner.blazor/appsettings.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"ServerProject": "asp.blazor.csproj",
3+
"Root": "..\\..\\..\\..\\asp.blazor",
4+
"Port": "5000",
5+
"RequestTimeout": "350",
6+
"ServerStartTimeout": "10"
7+
}

Diff for: ‎src/asptestrunner.blazor/asptestrunner.blazor.csproj

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
8+
<IsPackable>false</IsPackable>
9+
10+
<RootNamespace>asptestrunner</RootNamespace>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
15+
<PackageReference Include="NUnit" Version="3.13.3" />
16+
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
17+
<PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
18+
<PackageReference Include="coverlet.collector" Version="3.1.2" />
19+
<PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="104.0.1293.54" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<ProjectReference Include="..\asp.blazor\asp.blazor.csproj" />
24+
<ProjectReference Include="..\asptest.blazor\asptest.blazor.csproj" />
25+
<ProjectReference Include="..\iselenium.blazor\iselenium.blazor.csproj" />
26+
</ItemGroup>
27+
28+
<ItemGroup>
29+
<None Update="appsettings.json">
30+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
31+
</None>
32+
</ItemGroup>
33+
34+
</Project>

Diff for: ‎src/asptestrunner.core/appsettings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Server": "..\\..\\..\\..\\asp.core\\bin\\Debug\\net6.0\\asp.core.exe",
2+
"ServerProject": "asp.core.csproj",
33
"Root": "..\\..\\..\\..\\asp.core",
44
"Port": "5000",
55
"RequestTimeout": "350",

Diff for: ‎src/asptestrunner.websharper.spa/CSharpRunner.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class CSharpRunner : SpaTest<EdgeDriver>, ITestServer
1616
public void SetUp()
1717
{
1818
var config = this.GetConfig();
19-
this.StartServer(config, server: config["ServerCSharp"], root: config["RootCSharp"]);
19+
this.StartServer(config, serverproject: config["ServerProjectCSharp"], root: config["RootCSharp"]);
2020
}
2121

2222
[TearDown]

Diff for: ‎src/asptestrunner.websharper.spa/FSharpRunner.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class FSharpRunner : SpaTest<EdgeDriver>, ITestServer
1616
public void SetUp()
1717
{
1818
var config = this.GetConfig();
19-
this.StartServer(config, server: config["ServerFSharp"], root: config["RootCFharp"]);
19+
this.StartServer(config, serverproject: config["ServerProjectFSharp"], root: config["RootCFharp"]);
2020
}
2121

2222
[TearDown]

Diff for: ‎src/asptestrunner.websharper.spa/appsettings.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"ServerCSharp": "..\\..\\..\\..\\asp.websharper.spa\\bin\\Debug\\net6.0\\asp.websharper.spa.exe",
2+
"ServerProjectCSharp": "asp.websharper.spa.cssproj",
33
"RootCSharp": "..\\..\\..\\..\\asp.websharper.spa",
4-
"ServerFSharp": "..\\..\\..\\..\\asp.websharper.spa.fs\\bin\\Debug\\net6.0\\asp.websharper.spa.fs.exe",
4+
"ServerProjectFSharp": "asp.websharper.spa.fs.fsproj",
55
"RootCFharp": "..\\..\\..\\..\\asp.websharper.spa.fs",
66
"Port": "5000",
77
"RequestTimeout": "1000",

Diff for: ‎src/iselenium.core/ITestServer.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public static IConfiguration GetConfig(this ITestServer inst, string jsonFile)
3838

3939
/// <summary>
4040
/// Start the web application .exe as web server according to appsettings.json:
41-
/// Server: path to the server.exe (the .NET Core binary)
42-
/// Root: server application root directory
41+
/// ServerProject: Filename of the project file for dotnet run in the root directory
42+
/// Root: server application root directory, relative to the test binary
4343
/// Port: port to listen on
4444
/// RequestTimeout: expected duration of all tests in sec
4545
/// ServerStartTimeout: expected start time of the server in sec
@@ -53,32 +53,32 @@ public static void StartServer(this ITestServer inst)
5353
/// <summary>
5454
/// Start the web application .exe as web server with optional parameters
5555
/// overriding the default configuration in appsettings.json:
56-
/// Server: path to the server.exe (the .NET Core binary)
57-
/// Root: server application root directory
56+
/// ServerProject: Filename of the project file for dotnet run in the root directory
57+
/// Root: server application root directory, relative to the test binary
5858
/// Port: port to listen on
5959
/// RequestTimeout: expected duration of all tests in sec
6060
/// ServerStartTimeout: expected start time of the server in sec
6161
/// Can be called multiple times to start auxiliary service processes.
6262
/// </summary>
6363
/// <param name="config">default configuration</param>
64-
/// <param name="server">explicit path to the server.exe (the .NET Core binary)</param>
65-
/// <param name="root">explicit server application root directory</param>
64+
/// <param name="serverproject">Filename of the project file for dotnet run in the root directory</param>
65+
/// <param name="root">explicit server application root directory, relative to the test binary</param>
6666
/// <param name="port">explicit port to listen on</param>
6767
/// <param name="timeout">explicit expected duration of all tests in sec</param>
6868
/// <param name="servertimeout">expected start time of the server in sec</param>
6969
public static void StartServer(this ITestServer inst, IConfiguration config,
70-
string server = null, string root = null, int? port = null,
70+
string serverproject = null, string root = null, int? port = null,
7171
int? timeout = null, int? servertimeout = null)
7272
{
73-
string cserver = server ?? config["Server"];
73+
string cserverproject = serverproject ?? config["ServerProject"];
7474
string croot = root ?? config["Root"];
7575
int cport = port ?? config.GetValue<int>("Port");
7676
int ctimeout = timeout ?? config.GetValue<int>("RequestTimeout");
7777
int cservertimeout = servertimeout ?? config.GetValue<int>("ServerStartTimeout");
7878

7979
var info = new ProcessStartInfo();
80-
info.FileName = Path.GetFullPath(Path.Join(TestContext.CurrentContext.WorkDirectory, cserver));
81-
info.Arguments = String.Format("--urls=http://localhost:{0}/", cport);
80+
info.FileName = Path.Join(System.Environment.GetEnvironmentVariable("ProgramFiles"), "dotnet", "dotnet.exe");
81+
info.Arguments = $"run --no-build --project {cserverproject} -- --urls=http://localhost:{cport}/";
8282
info.WorkingDirectory = Path.GetFullPath(Path.Join(TestContext.CurrentContext.WorkDirectory, croot));
8383
info.UseShellExecute = true;
8484
if (inst.ServerProcesses == null)

Diff for: ‎src/minimal.blazor/appsettings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"DatabaseStorageExpires": "1",
1111
"EncryptDatabaseStorage": "False",
1212
"EncryptViewStateKey": "<-- secret w/o server affinity -->",
13-
"ASP_DBEntities": "Data Source=(local);Initial Catalog=ASP_DB;Persist Security Info=True;User ID=iis;Password=pass;multipleactiveresultsets=True;",
13+
"ASP_DBEntities": "Data Source=(local);Initial Catalog=ASP_DB;Persist Security Info=True;User ID=iis;Password=pass;multipleactiveresultsets=True;TrustServerCertificate=true;",
1414
"RequestTimeout": "2",
1515
"TestWriteThrottle": "0",
1616
"TestFilterWhere": ""

Diff for: ‎src/minimal.core/appsettings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"RequestTimeout": "5",
77
"IEVisible": "False",
88
"TestFilterWhere": "",
9-
"ASP_DBEntities": "Data Source=(local);Initial Catalog=ASP_DB;Persist Security Info=True;User ID=iis;Password=pass;multipleactiveresultsets=True;"
9+
"ASP_DBEntities": "Data Source=(local);Initial Catalog=ASP_DB;Persist Security Info=True;User ID=iis;Password=pass;multipleactiveresultsets=True;TrustServerCertificate=true;"
1010
}

0 commit comments

Comments
 (0)