Skip to content

RM-9508 Fix web test problems on Linux #1367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
a-ctor wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

RM-9508 Fix web test problems on Linux #1367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Remotion/Development/Web/ResourceHosting/ResourceVirtualPathProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ public bool IsMappedPath (string virtualPath)
if (!checkPath.StartsWith(_resourceRoot, StringComparison.OrdinalIgnoreCase))
return false;

return GetResourcePathMapping(checkPath) != null;
var result = GetResourcePathMapping(checkPath) != null;
return result;
}

public override bool FileExists (string virtualPath)
Expand Down Expand Up @@ -201,7 +202,7 @@ private ResourceVirtualFile GetResourceVirtualFile (string virtualPath)
if (mapping != null)
{
var resourceRootPath = CombineVirtualPath(_resourceRoot, mapping.VirtualPath);
var directoryRelativePath = MakeRelativeVirtualPath(resourceRootPath, appRelativeVirtualPath).Replace('/', '\\');
var directoryRelativePath = MakeRelativeVirtualPath(resourceRootPath, appRelativeVirtualPath).Replace('/', Path.DirectorySeparatorChar);
var directory = Path.GetFullPath(Path.Combine(GetProjectRoot(), mapping.RelativeFileSystemPath));
var filePath = Path.Combine(directory, directoryRelativePath);

Expand Down Expand Up @@ -232,7 +233,7 @@ private ResourceVirtualDirectory GetResourceVirtualDirectory (string virtualDir)
{
displayName = mapping.VirtualPath.TrimEnd('/');
var resourceRootPath = CombineVirtualPath(_resourceRoot, mapping.VirtualPath);
var directoryRelativePath = MakeRelativeVirtualPath(resourceRootPath, appRelativeVirtualPath).Replace('/', '\\');
var directoryRelativePath = MakeRelativeVirtualPath(resourceRootPath, appRelativeVirtualPath).Replace('/', Path.DirectorySeparatorChar);
var mappedRootDirectory = Path.GetFullPath(Path.Combine(GetProjectRoot(), mapping.RelativeFileSystemPath));
var absolutePath = Path.Combine(mappedRootDirectory, directoryRelativePath);

Expand Down
3 changes: 3 additions & 0 deletions ...bjectBinding/Web.Compatibility.UnitTests/ObjectBinding.Web.Compatibility.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,8 @@
<ProjectReference Include="..\Web.Compatibility\ObjectBinding.Web.Compatibility.csproj" />
<ProjectReference Include="..\Web\ObjectBinding.Web.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CoreForms.Web" />
</ItemGroup>
<Import Project="..\..\..\Build\Shared.build.targets" />
</Project>
20 changes: 10 additions & 10 deletions Remotion/ObjectBinding/Web.Development.WebTesting.IntegrationTests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@
asyncJavaScriptTimeout="00:00:10"
headless="true"
webApplicationRoot="http://localhost:60402/"
screenshotDirectory=".\WebTestingOutput"
logsDirectory=".\WebTestingOutput"
screenshotDirectory="./WebTestingOutput"
logsDirectory="./WebTestingOutput"
closeBrowserWindowsOnSetUpAndTearDown="false"
cleanUpUnmatchedDownloadedFiles="false"
requestErrorDetectionStrategy="AspNet">
<hosting name="AspNetCore" type="AspNetCore" port="60402" hostname="localhost" useHttps="false"/>
<testSiteLayout rootPath=".\..\..\..\..\Web.Development.WebTesting.TestSite" processPath="bin\Remotion.ObjectBinding.Web.Development.WebTesting.TestSite.exe">
<testSiteLayout rootPath="./../../../../Web.Development.WebTesting.TestSite" processPath="dotnet" processArguments="exec bin/Remotion.ObjectBinding.Web.Development.WebTesting.TestSite.dll">
<resources>
<add path="..\..\ObjectBinding\Sample\res" />
<add path="..\..\ObjectBinding\Web\res" />
<add path="..\..\ObjectBinding\Web.ClientScript\bin" />
<add path="..\..\ObjectBinding\Web.Development.WebTesting.TestSite.Shared" />
<add path="..\..\Web\Core\res" />
<add path="..\..\Web\ClientScript\bin" />
<add path="../../ObjectBinding/Sample/res" />
<add path="../../ObjectBinding/Web/Res" />
<add path="../../ObjectBinding/Web.ClientScript/bin" />
<add path="../../ObjectBinding/Web.Development.WebTesting.TestSite.Shared" />
<add path="../../Web/Core/Res" />
<add path="../../Web/ClientScript/bin" />
</resources>
</testSiteLayout>
<chrome disableSecurityWarningsBehavior="Ignore" />
Expand All @@ -50,7 +50,7 @@
</layout>
</appender>
<appender name="FileAppender" type="log4net.Appender.FileAppender">
<file value=".\WebTestingOutput\ObjectBinding.WebTestingFramework.log" />
<file value="./WebTestingOutput/ObjectBinding.WebTestingFramework.log" />
<appendToFile value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
Expand Down
2 changes: 1 addition & 1 deletion Remotion/ObjectBinding/Web.Development.WebTesting.TestSite.Shared/ControlTestForm.aspx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ protected override void OnLoad (EventArgs e)

private void LoadUserControl ()
{
var control = LoadControl(CurrentFunction.UserControl);
var control = LoadControl(CurrentFunction.UserControl);
_dataEditControl = (IDataEditControl)control;
_dataEditControl.ID = "DataEditControl";

Expand Down
70 changes: 37 additions & 33 deletions Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,43 @@
http://go.microsoft.com/fwlink/?LinkId=169433
-->
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
</configSections>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
</configSections>

<appSettings>
<add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
</appSettings>
<appSettings>
<add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
</appSettings>

<system.web>
<globalization culture="de-AT" uiCulture="en-US" />
<compilation debug="true">
<assemblies>
<add assembly="System.Drawing.Primitives" />
<add assembly="System.ComponentModel.Primitives" />
</assemblies>
</compilation>
<httpModules>
<add name="Session" type="System.Web.SessionState.SessionStateModule" />
</httpModules>
<httpRuntime requestValidationMode="2.0" />
<pages validateRequest="false">
<controls>
<add tagPrefix="asp" namespace="System.Web.UI" assembly="CoreForms.Web.Extensions" />
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="CoreForms.Web.Extensions" />
<add tagPrefix="asp" namespace="System.Web.UI.WebControls.Expressions"
assembly="CoreForms.Web.Extensions" />
<add tagPrefix="remotion" namespace="Remotion.Web.UI.Controls" assembly="Remotion.Web" />
<add tagPrefix="remotion" namespace="Remotion.ObjectBinding.Web.UI.Controls"
assembly="Remotion.ObjectBinding.Web" />
<add tagPrefix="testsite"
namespace="Remotion.ObjectBinding.Web.Development.WebTesting.TestSite.Shared.Controls"
assembly="Remotion.ObjectBinding.Web.Development.WebTesting.TestSite.Shared" />
</controls>
</pages>
<httpHandlers>
<add verb="*" path="*.wxe" type="Remotion.Web.ExecutionEngine.WxeHandler, Remotion.Web" />
</httpHandlers>
</system.web>

<system.web>
<globalization culture="de-AT" uiCulture="en-US"/>
<compilation debug="true">
<assemblies>
<add assembly="System.Drawing.Primitives"/>
</assemblies>
</compilation>
<httpModules>
<add name="Session" type="System.Web.SessionState.SessionStateModule"/>
</httpModules>
<httpRuntime requestValidationMode="2.0" />
<pages validateRequest="false">
<controls>
<add tagPrefix="asp" namespace="System.Web.UI" assembly="CoreForms.Web.Extensions"/>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="CoreForms.Web.Extensions"/>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls.Expressions" assembly="CoreForms.Web.Extensions"/>
<add tagPrefix="remotion" namespace="Remotion.Web.UI.Controls" assembly="Remotion.Web" />
<add tagPrefix="remotion" namespace="Remotion.ObjectBinding.Web.UI.Controls" assembly="Remotion.ObjectBinding.Web" />
<add tagPrefix="testsite" namespace="Remotion.ObjectBinding.Web.Development.WebTesting.TestSite.Shared.Controls"
assembly="Remotion.ObjectBinding.Web.Development.WebTesting.TestSite.Shared" />
</controls>
</pages>
<httpHandlers>
<add verb="*" path="*.wxe" type="Remotion.Web.ExecutionEngine.WxeHandler, Remotion.Web" />
</httpHandlers>
</system.web>

</configuration>
5 changes: 3 additions & 2 deletions Remotion/ObjectBinding/Web.Development.WebTesting.TestSite/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@
"ObjectBinding.Web.Development.WebTesting.TestSite": {
"commandName": "Project",
"dotnetRunMessages": "true",
"launchBrowser": true,
"launchBrowser": false,
"launchUrl": "index.html",
"applicationUrl": "https://localhost:50543;http://localhost:50500",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"DOTNET_ROOT": "/usr/share/dotnet"
}
}
}
Expand Down
0 ...velopment.WebTesting.TestSite/Global.asax → ...velopment.WebTesting.TestSite/global.asax
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions ...opment.WebTesting.TestSite/Global.asax.cs → ...opment.WebTesting.TestSite/global.asax.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,14 @@ private static void RegisterResourceVirtualPathProvider ()
s_resourceVirtualPathProvider = new ResourceVirtualPathProvider(
new[]
{
new ResourcePathMapping("Remotion.ObjectBinding.Sample/Image", @$"..\..\ObjectBinding\Sample\res\Image"),
new ResourcePathMapping("Remotion.ObjectBinding.Web/Html", @$"..\..\ObjectBinding\Web.ClientScript\bin\{configuration}\dist"),
new ResourcePathMapping("Remotion.ObjectBinding.Web/Themes", @"..\..\ObjectBinding\Web\res\Themes"),
new ResourcePathMapping("Remotion.ObjectBinding.Web.Development.WebTesting.TestSite.Shared", @"..\..\ObjectBinding\Web.Development.WebTesting.TestSite.Shared"),
new ResourcePathMapping("Remotion.Web/Html", @$"..\..\Web\ClientScript\bin\{configuration}\dist"),
new ResourcePathMapping("Remotion.Web/Image", @"..\..\Web\Core\res\Image"),
new ResourcePathMapping("Remotion.Web/Themes", @"..\..\Web\Core\res\Themes"),
new ResourcePathMapping("Remotion.Web/UI", @"..\..\Web\Core\res\UI"),
new ResourcePathMapping("Remotion.ObjectBinding.Sample/Image", @$"../../ObjectBinding/Sample/res/Image"),
new ResourcePathMapping("Remotion.ObjectBinding.Web/Html", @$"../../ObjectBinding/Web.ClientScript/bin/{configuration}/dist"),
new ResourcePathMapping("Remotion.ObjectBinding.Web/Themes", @"../../ObjectBinding/Web/Res/Themes"),
new ResourcePathMapping("Remotion.ObjectBinding.Web.Development.WebTesting.TestSite.Shared", @"../../ObjectBinding/Web.Development.WebTesting.TestSite.Shared"),
new ResourcePathMapping("Remotion.Web/Html", @$"../../Web/ClientScript/bin/{configuration}/dist"),
new ResourcePathMapping("Remotion.Web/Image", @"../../Web/Core/Res/Image"),
new ResourcePathMapping("Remotion.Web/Themes", @"../../Web/Core/Res/Themes"),
new ResourcePathMapping("Remotion.Web/UI", @"../../Web/Core/Res/UI"),
},
FileExtensionHandlerMapping.Default);
s_resourceVirtualPathProvider.Register();
Expand Down
0 ....Job/2D15EFA6-AC6C-4b35-8678-8AE55E0D8ECC → ....Job/2d15efa6-ac6c-4b35-8678-8ae55e0d8ecc
View file
Open in desktop
File renamed without changes.
0 ....Job/774E8412-FA31-46c6-B9F5-703DCB91CE24 → ....Job/774e8412-fa31-46c6-b9f5-703dcb91ce24
View file
Open in desktop
File renamed without changes.
0 ....Job/EFBF1D71-D05A-46c4-8E30-0287307042C3 → ....Job/efbf1d71-d05a-46c4-8e30-0287307042c3
View file
Open in desktop
File renamed without changes.
0 ...rson/00000000-0000-0000-0000-00000000000A → ...rson/00000000-0000-0000-0000-00000000000a
View file
Open in desktop
File renamed without changes.
0 ...rson/00000000-0000-0000-0000-00000000000F → ...rson/00000000-0000-0000-0000-00000000000f
View file
Open in desktop
File renamed without changes.
20 changes: 10 additions & 10 deletions Remotion/ObjectBinding/Web.IntegrationTests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@
asyncJavaScriptTimeout="00:00:10"
headless="true"
webApplicationRoot="http://localhost:60402/"
screenshotDirectory=".\WebTestingOutput"
logsDirectory=".\WebTestingOutput"
screenshotDirectory="./WebTestingOutput"
logsDirectory="./WebTestingOutput"
closeBrowserWindowsOnSetUpAndTearDown="false"
cleanUpUnmatchedDownloadedFiles="false"
requestErrorDetectionStrategy="AspNet">
<hosting name="AspNetCore" type="AspNetCore" port="60402" hostname="localhost" useHttps="false"/>
<testSiteLayout rootPath=".\..\..\..\..\Web.Development.WebTesting.TestSite" processPath="bin\Remotion.ObjectBinding.Web.Development.WebTesting.TestSite.exe">
<testSiteLayout rootPath="./../../../../Web.Development.WebTesting.TestSite" processPath="dotnet" processArguments="exec bin/Remotion.ObjectBinding.Web.Development.WebTesting.TestSite.dll">
<resources>
<add path="..\..\ObjectBinding\Sample\res" />
<add path="..\..\ObjectBinding\Web\res" />
<add path="..\..\ObjectBinding\Web.ClientScript\bin" />
<add path="..\..\ObjectBinding\Web.Development.WebTesting.TestSite.Shared" />
<add path="..\..\Web\Core\res" />
<add path="..\..\Web\ClientScript\bin" />
<add path="../../ObjectBinding/Sample/res" />
<add path="../../ObjectBinding/Web/Res" />
<add path="../../ObjectBinding/Web.ClientScript/bin" />
<add path="../../ObjectBinding/Web.Development.WebTesting.TestSite.Shared" />
<add path="../../Web/Core/Res" />
<add path="../../Web/ClientScript/bin" />
</resources>
</testSiteLayout>
<remoteDriver enabled="false" url="http://localhost:4444" />
Expand All @@ -45,7 +45,7 @@
</layout>
</appender>
<appender name="FileAppender" type="log4net.Appender.FileAppender">
<file value=".\WebTestingOutput\ObjectBinding.WebTestingFramework.log" />
<file value="./WebTestingOutput/ObjectBinding.WebTestingFramework.log" />
<appendToFile value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
Expand Down
0 .../Res/Themes/NovaGray/Html/BocCheckBox.css → .../Res/Themes/NovaGray/Html/BocCheckbox.css
View file
Open in desktop
File renamed without changes.
0 ...HTML/BocAutoCompleteReferenceValue.UI.css → ...Html/BocAutoCompleteReferenceValue.UI.css
View file
Open in desktop
File renamed without changes.
0 ...so/HTML/BocAutoCompleteReferenceValue.css → ...so/Html/BocAutoCompleteReferenceValue.css
View file
Open in desktop
File renamed without changes.
0 .../Themes/NovaViso/HTML/BocBooleanValue.css → .../Themes/NovaViso/Html/BocBooleanValue.css
View file
Open in desktop
File renamed without changes.
0 .../Res/Themes/NovaViso/HTML/BocCheckBox.css → .../Res/Themes/NovaViso/Html/BocCheckbox.css
View file
Open in desktop
File renamed without changes.
0 ...Themes/NovaViso/HTML/BocDateTimeValue.css → ...Themes/NovaViso/Html/BocDateTimeValue.css
View file
Open in desktop
File renamed without changes.
0 ...Res/Themes/NovaViso/HTML/BocEnumValue.css → ...Res/Themes/NovaViso/Html/BocEnumValue.css
View file
Open in desktop
File renamed without changes.
0 .../Web/Res/Themes/NovaViso/HTML/BocList.css → .../Web/Res/Themes/NovaViso/Html/BocList.css
View file
Open in desktop
File renamed without changes.
0 ...s/NovaViso/HTML/BocMultilineTextValue.css → ...s/NovaViso/Html/BocMultilineTextValue.css
View file
Open in desktop
File renamed without changes.
0 ...hemes/NovaViso/HTML/BocReferenceValue.css → ...hemes/NovaViso/Html/BocReferenceValue.css
View file
Open in desktop
File renamed without changes.
0 ...Res/Themes/NovaViso/HTML/BocTextValue.css → ...Res/Themes/NovaViso/Html/BocTextValue.css
View file
Open in desktop
File renamed without changes.
0 .../Core/Res/Themes/NovaGray/HTML/Common.css → .../Core/Res/Themes/NovaGray/Html/Common.css
View file
Open in desktop
File renamed without changes.
0 ...e/Res/Themes/NovaGray/HTML/DatePicker.css → ...e/Res/Themes/NovaGray/Html/DatePicker.css
View file
Open in desktop
File renamed without changes.
0 ...Res/Themes/NovaGray/HTML/DropDownMenu.css → ...Res/Themes/NovaGray/Html/DropDownMenu.css
View file
Open in desktop
File renamed without changes.
0 .../Themes/NovaGray/HTML/ExecutionEngine.css → .../Themes/NovaGray/Html/ExecutionEngine.css
View file
Open in desktop
File renamed without changes.
0 ...ore/Res/Themes/NovaGray/HTML/FormGrid.css → ...ore/Res/Themes/NovaGray/Html/FormGrid.css
View file
Open in desktop
File renamed without changes.
0 ...ore/Res/Themes/NovaGray/HTML/ListMenu.css → ...ore/Res/Themes/NovaGray/Html/ListMenu.css
View file
Open in desktop
File renamed without changes.
0 .../Res/Themes/NovaGray/HTML/Roboto-Bold.ttf → .../Res/Themes/NovaGray/Html/Roboto-Bold.ttf
View file
Open in desktop
File renamed without changes.
0 ...es/Themes/NovaGray/HTML/Roboto-Medium.ttf → ...es/Themes/NovaGray/Html/Roboto-Medium.ttf
View file
Open in desktop
File renamed without changes.
0 ...s/Themes/NovaGray/HTML/Roboto-Regular.ttf → ...s/Themes/NovaGray/Html/Roboto-Regular.ttf
View file
Open in desktop
File renamed without changes.
0 ...e/Res/Themes/NovaGray/HTML/SingleView.css → ...e/Res/Themes/NovaGray/Html/SingleView.css
View file
Open in desktop
File renamed without changes.
0 ...re/Res/Themes/NovaGray/HTML/SmartPage.css → ...re/Res/Themes/NovaGray/Html/SmartPage.css
View file
Open in desktop
File renamed without changes.
0 ...b/Core/Res/Themes/NovaGray/HTML/Style.css → ...b/Core/Res/Themes/NovaGray/Html/Style.css
View file
Open in desktop
File renamed without changes.
0 .../Res/Themes/NovaGray/HTML/StyleUtility.js → .../Res/Themes/NovaGray/Html/StyleUtility.js
View file
Open in desktop
File renamed without changes.
0 ...ore/Res/Themes/NovaGray/HTML/TabStrip.css → ...ore/Res/Themes/NovaGray/Html/TabStrip.css
View file
Open in desktop
File renamed without changes.
0 ...e/Res/Themes/NovaGray/HTML/TabbedMenu.css → ...e/Res/Themes/NovaGray/Html/TabbedMenu.css
View file
Open in desktop
File renamed without changes.
0 .../Themes/NovaGray/HTML/TabbedMultiView.css → .../Themes/NovaGray/Html/TabbedMultiView.css
View file
Open in desktop
File renamed without changes.
0 ...ore/Res/Themes/NovaGray/HTML/TreeView.css → ...ore/Res/Themes/NovaGray/Html/TreeView.css
View file
Open in desktop
File renamed without changes.
0 ...re/Res/Themes/NovaGray/HTML/WebButton.css → ...re/Res/Themes/NovaGray/Html/WebButton.css
View file
Open in desktop
File renamed without changes.
0 .../Core/Res/Themes/NovaViso/HTML/Common.css → .../Core/Res/Themes/NovaViso/Html/Common.css
View file
Open in desktop
File renamed without changes.
0 ...e/Res/Themes/NovaViso/HTML/DatePicker.css → ...e/Res/Themes/NovaViso/Html/DatePicker.css
View file
Open in desktop
File renamed without changes.
0 ...Res/Themes/NovaViso/HTML/DropDownMenu.css → ...Res/Themes/NovaViso/Html/DropDownMenu.css
View file
Open in desktop
File renamed without changes.
0 .../Themes/NovaViso/HTML/ExecutionEngine.css → .../Themes/NovaViso/Html/ExecutionEngine.css
View file
Open in desktop
File renamed without changes.
0 ...ore/Res/Themes/NovaViso/HTML/FormGrid.css → ...ore/Res/Themes/NovaViso/Html/FormGrid.css
View file
Open in desktop
File renamed without changes.
0 ...ore/Res/Themes/NovaViso/HTML/ListMenu.css → ...ore/Res/Themes/NovaViso/Html/ListMenu.css
View file
Open in desktop
File renamed without changes.
0 .../Res/Themes/NovaViso/HTML/Roboto-Bold.ttf → .../Res/Themes/NovaViso/Html/Roboto-Bold.ttf
View file
Open in desktop
File renamed without changes.
0 ...s/Themes/NovaViso/HTML/Roboto-License.txt → ...s/Themes/NovaViso/Html/Roboto-License.txt
View file
Open in desktop
File renamed without changes.
0 ...es/Themes/NovaViso/HTML/Roboto-Medium.ttf → ...es/Themes/NovaViso/Html/Roboto-Medium.ttf
View file
Open in desktop
File renamed without changes.
0 ...s/Themes/NovaViso/HTML/Roboto-Regular.ttf → ...s/Themes/NovaViso/Html/Roboto-Regular.ttf
View file
Open in desktop
File renamed without changes.
0 ...e/Res/Themes/NovaViso/HTML/SingleView.css → ...e/Res/Themes/NovaViso/Html/SingleView.css
View file
Open in desktop
File renamed without changes.
0 ...re/Res/Themes/NovaViso/HTML/SmartPage.css → ...re/Res/Themes/NovaViso/Html/SmartPage.css
View file
Open in desktop
File renamed without changes.
0 ...b/Core/Res/Themes/NovaViso/HTML/Style.css → ...b/Core/Res/Themes/NovaViso/Html/Style.css
View file
Open in desktop
File renamed without changes.
0 .../Res/Themes/NovaViso/HTML/StyleUtility.js → .../Res/Themes/NovaViso/Html/StyleUtility.js
View file
Open in desktop
File renamed without changes.
0 ...ore/Res/Themes/NovaViso/HTML/TabStrip.css → ...ore/Res/Themes/NovaViso/Html/TabStrip.css
View file
Open in desktop
File renamed without changes.
0 ...e/Res/Themes/NovaViso/HTML/TabbedMenu.css → ...e/Res/Themes/NovaViso/Html/TabbedMenu.css
View file
Open in desktop
File renamed without changes.
0 .../Themes/NovaViso/HTML/TabbedMultiView.css → .../Themes/NovaViso/Html/TabbedMultiView.css
View file
Open in desktop
File renamed without changes.
0 ...ore/Res/Themes/NovaViso/HTML/TreeView.css → ...ore/Res/Themes/NovaViso/Html/TreeView.css
View file
Open in desktop
File renamed without changes.
0 ...re/Res/Themes/NovaViso/HTML/WebButton.css → ...re/Res/Themes/NovaViso/Html/WebButton.css
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions Remotion/Web/Core/Web.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<ItemGroup>
<PackageReference Include="Remotion.ThirdPartyDependency.RobotoFonts" />
<PackageReference Include="Remotion.ThirdPartyDependency.System.Web" />
<PackageReference Include="System.CodeDom" />
</ItemGroup>
<Target Name="EnsureClientScriptResourcesAreIncluded" BeforeTargets="Pack">
<Error Text="Client script resources were not found." Condition="'@(_clientScriptResources)' == ''"/>
Expand Down
14 changes: 7 additions & 7 deletions Remotion/Web/Development.WebTesting.IntegrationTests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
asyncJavaScriptTimeout="00:00:10"
headless="true"
webApplicationRoot="http://localhost:60401/"
screenshotDirectory=".\WebTestingOutput"
logsDirectory=".\WebTestingOutput"
screenshotDirectory="./WebTestingOutput"
logsDirectory="./WebTestingOutput"
closeBrowserWindowsOnSetUpAndTearDown="false"
cleanUpUnmatchedDownloadedFiles="false"
requestErrorDetectionStrategy="Remotion.Web.Development.WebTesting.IntegrationTests.DiagnosticInformationCollectingRequestErrorDetectionStrategy, Remotion.Web.Development.WebTesting.IntegrationTests">
<hosting name="AspNetCore" type="AspNetCore" port="60401" hostname="localhost" useHttps="false"/>
<testSiteLayout rootPath=".\..\..\..\..\Development.WebTesting.TestSite" processPath="bin\Remotion.Web.Development.WebTesting.TestSite.exe">
<testSiteLayout rootPath="./../../../../Development.WebTesting.TestSite" processPath="dotnet" processArguments="exec bin/Remotion.Web.Development.WebTesting.TestSite.dll">
<resources>
<add path="..\..\Web\Core\res" />
<add path="..\..\Web\ClientScript\bin" />
<add path="..\..\Web\Development.WebTesting.TestSite.Shared" />
<add path="../../Web/Core/Res" />
<add path="../../Web/ClientScript/bin" />
<add path="../../Web/Development.WebTesting.TestSite.Shared" />
</resources>
</testSiteLayout>
<chrome disableSecurityWarningsBehavior="Automatic" />
Expand All @@ -47,7 +47,7 @@
</layout>
</appender>
<appender name="FileAppender" type="log4net.Appender.FileAppender">
<file value=".\WebTestingOutput\Web.Development.WebTesting.IntegrationTests.log" />
<file value="./WebTestingOutput/Web.Development.WebTesting.IntegrationTests.log" />
<appendToFile value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
Expand Down
1 change: 0 additions & 1 deletion Remotion/Web/Development.WebTesting.TestSite/Global.asax
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions Remotion/Web/Development.WebTesting.TestSite/global.asax
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<%@ Application Codebehind="global.asax.cs" Inherits="Remotion.Web.Development.WebTesting.TestSite.Global" Language="C#" %>
10 changes: 5 additions & 5 deletions ...opment.WebTesting.TestSite/Global.asax.cs → ...opment.WebTesting.TestSite/global.asax.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ private static void RegisterResourceVirtualPathProvider ()
_resourceVirtualPathProvider = new ResourceVirtualPathProvider(
new[]
{
new ResourcePathMapping("Remotion.Web/Html", @$"..\..\Web\ClientScript\bin\{configuration}\dist"),
new ResourcePathMapping("Remotion.Web/Image", @"..\..\Web\Core\res\Image"),
new ResourcePathMapping("Remotion.Web/Themes", @"..\..\Web\Core\res\Themes"),
new ResourcePathMapping("Remotion.Web/UI", @"..\..\Web\Core\res\UI"),
new ResourcePathMapping("Remotion.Web.Development.WebTesting.TestSite.Shared", @"..\..\Web\Development.WebTesting.TestSite.Shared")
new ResourcePathMapping("Remotion.Web/Html", @$"../../Web/ClientScript/bin/{configuration}/dist"),
new ResourcePathMapping("Remotion.Web/Image", @"../../Web/Core/Res/Image"),
new ResourcePathMapping("Remotion.Web/Themes", @"../../Web/Core/Res/Themes"),
new ResourcePathMapping("Remotion.Web/UI", @"../../Web/Core/Res/UI"),
new ResourcePathMapping("Remotion.Web.Development.WebTesting.TestSite.Shared", @"../../Web/Development.WebTesting.TestSite.Shared")
},
fileExtensionHandlerMapping.ToArray());
_resourceVirtualPathProvider.Register();
Expand Down
2 changes: 2 additions & 0 deletions Remotion/Web/Development.WebTesting/Utilities/ProcessUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ private static extern int NtQueryInformationProcess (
public static int GetParentProcessID ([NotNull] Process target)
{
ArgumentNullException.ThrowIfNull(target);
if (!OperatingSystem.IsWindows())
return -1;

// Query the process information
var info = new ParentInfo();
Expand Down
1 change: 1 addition & 0 deletions Remotion/Web/Development.WebTesting/Web.Development.WebTesting.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" />
<PackageReference Include="Microsoft.Maui.Graphics.Skia" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" />
<PackageReference Include="System.Configuration.ConfigurationManager" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\SharedSource\Core\Utilities\ArgumentUtility.cs" Link="SharedSource\Utilities\ArgumentUtility.cs" />
Expand Down
14 changes: 7 additions & 7 deletions Remotion/Web/IntegrationTests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@
asyncJavaScriptTimeout="00:00:10"
headless="true"
webApplicationRoot="http://localhost:60401/"
screenshotDirectory=".\WebTestingOutput"
logsDirectory=".\WebTestingOutput"
screenshotDirectory="./WebTestingOutput"
logsDirectory="./WebTestingOutput"
closeBrowserWindowsOnSetUpAndTearDown="false"
cleanUpUnmatchedDownloadedFiles="false"
requestErrorDetectionStrategy="Remotion.Web.Development.WebTesting.IntegrationTests.DiagnosticInformationCollectingRequestErrorDetectionStrategy, Remotion.Web.Development.WebTesting.IntegrationTests">
<hosting name="AspNetCore" type="AspNetCore" port="60401" hostname="localhost" useHttps="false"/>
<testSiteLayout rootPath=".\..\..\..\..\Development.WebTesting.TestSite" processPath="bin\Remotion.Web.Development.WebTesting.TestSite.exe">
<testSiteLayout rootPath="./../../../../Development.WebTesting.TestSite" processPath="dotnet" processArguments="bin/Remotion.Web.Development.WebTesting.TestSite.dll">
<resources>
<add path="..\..\Web\Core\res" />
<add path="..\..\Web\ClientScript\bin" />
<add path="..\..\Web\Development.WebTesting.TestSite.Shared" />
<add path="../../Web/Core/Res" />
<add path="../../Web/ClientScript/bin" />
<add path="../../Web/Development.WebTesting.TestSite.Shared" />
</resources>
</testSiteLayout>
<remoteDriver enabled="false" url="http://localhost:4444" />
Expand All @@ -44,7 +44,7 @@
</layout>
</appender>
<appender name="FileAppender" type="log4net.Appender.FileAppender">
<file value=".\WebTestingOutput\Web.IntegrationTests.log" />
<file value="./WebTestingOutput/Web.IntegrationTests.log" />
<appendToFile value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
Expand Down