yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing tests

Browse Source
This commit is contained in:
Shannon
2020-04-03 17:05:50 +11:00
parent 4920268ec8
commit d711796c59
18 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
View File

@@ -21,7 +21,9 @@ namespace Umbraco.Web.Hosting
ApplicationId = HostingEnvironment.ApplicationID;
// when we are not hosted (i.e. unit test or otherwise) we'll need to get the root path from the executing assembly
ApplicationPhysicalPath = HostingEnvironment.ApplicationPhysicalPath ?? Assembly.GetExecutingAssembly().GetRootDirectorySafe();
ApplicationVirtualPath = hostingSettings.ApplicationVirtualPath ?? HostingEnvironment.ApplicationVirtualPath?.EnsureStartsWith("/") ?? "/";
ApplicationVirtualPath = hostingSettings.ApplicationVirtualPath?.EnsureStartsWith('/')
?? HostingEnvironment.ApplicationVirtualPath?.EnsureStartsWith("/")
?? "/";
IISVersion = HttpRuntime.IISVersion;
}
@@ -38,7 +40,11 @@ namespace Umbraco.Web.Hosting
public string MapPath(string path)
{
return HostingEnvironment.MapPath(path);
if (HostingEnvironment.IsHosted)
return HostingEnvironment.MapPath(path);
// this will be the case in unit tests, we'll manually map the path
return ApplicationPhysicalPath + path.TrimStart("~").EnsureStartsWith("/");
}
public string ToAbsolute(string virtualPath) => VirtualPathUtility.ToAbsolute(virtualPath, ApplicationVirtualPath);