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

Uses URL path separator when generating UDIs for files nested in folders. (#13689)

Browse Source
This commit is contained in:
Andy Butland
2023-01-31 09:46:45 +01:00
committed by GitHub
parent 823c59cee1
commit e87196909a
5 changed files with 138 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Core/Extensions/UdiGetterExtensions.cs
View File

@@ -232,9 +232,7 @@ public static class UdiGetterExtensions
throw new ArgumentNullException("entity");
}
return new StringUdi(
Constants.UdiEntityType.Stylesheet,
entity.Path.TrimStart(Constants.CharArrays.ForwardSlash)).EnsureClosed();
return GetUdiFromPath(Constants.UdiEntityType.Stylesheet, entity.Path);
}
/// <summary>
@@ -249,8 +247,15 @@ public static class UdiGetterExtensions
throw new ArgumentNullException("entity");
}
return new StringUdi(Constants.UdiEntityType.Script, entity.Path.TrimStart(Constants.CharArrays.ForwardSlash))
.EnsureClosed();
return GetUdiFromPath(Constants.UdiEntityType.Script, entity.Path);
}
private static StringUdi GetUdiFromPath(string entityType, string path)
{
var id = path
.TrimStart(Constants.CharArrays.ForwardSlash)
.Replace("\\", "/");
return new StringUdi(entityType, id).EnsureClosed();
}
/// <summary>
@@ -300,7 +305,7 @@ public static class UdiGetterExtensions
? Constants.UdiEntityType.PartialViewMacro
: Constants.UdiEntityType.PartialView;
return new StringUdi(entityType, entity.Path.TrimStart(Constants.CharArrays.ForwardSlash)).EnsureClosed();
return GetUdiFromPath(entityType, entity.Path);
}
/// <summary>

41
tests/Umbraco.Tests.Common/Builders/PartialViewBuilder.cs Normal file
View File

@@ -0,0 +1,41 @@
// Copyright (c) Umbraco.
// See LICENSE for more details.
using Umbraco.Cms.Core.Models;
namespace Umbraco.Cms.Tests.Common.Builders;
public class PartialViewBuilder
: BuilderBase<IPartialView>
{
private string _path;
private string _content;
private PartialViewType _viewType = PartialViewType.Unknown;
public PartialViewBuilder WithPath(string path)
{
_path = path;
return this;
}
public PartialViewBuilder WithContent(string content)
{
_content = content;
return this;
}
public PartialViewBuilder WithViewType(PartialViewType viewType)
{
_viewType = viewType;
return this;
}
public override IPartialView Build()
{
var path = _path ?? string.Empty;
var content = _content ?? string.Empty;
var viewType = _viewType;
return new PartialView(viewType, path) { Content = content };
}
}

33
tests/Umbraco.Tests.Common/Builders/ScriptBuilder.cs Normal file
View File

@@ -0,0 +1,33 @@
// Copyright (c) Umbraco.
// See LICENSE for more details.
using Umbraco.Cms.Core.Models;
namespace Umbraco.Cms.Tests.Common.Builders;
public class ScriptBuilder
: BuilderBase<Script>
{
private string _path;
private string _content;
public ScriptBuilder WithPath(string path)
{
_path = path;
return this;
}
public ScriptBuilder WithContent(string content)
{
_content = content;
return this;
}
public override Script Build()
{
var path = _path ?? string.Empty;
var content = _content ?? string.Empty;
return new Script(path) { Content = content };
}
}

2
tests/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs
View File

@@ -8,8 +8,8 @@ namespace Umbraco.Cms.Tests.Common.Builders;
public class StylesheetBuilder
: BuilderBase<Stylesheet>
{
private string _content;
private string _path;
private string _content;
public StylesheetBuilder WithPath(string path)
{

52
tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UdiGetterExtensionsTests.cs Normal file
View File

@@ -0,0 +1,52 @@
// Copyright (c) Umbraco.
// See LICENSE for more details.
using NUnit.Framework;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Tests.Common.Builders;
using Umbraco.Extensions;
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Extensions;
[TestFixture]
public class UdiGetterExtensionsTests
{
[TestCase("style.css", "umb://stylesheet/style.css")]
[TestCase("editor\\style.css", "umb://stylesheet/editor/style.css")]
[TestCase("editor/style.css", "umb://stylesheet/editor/style.css")]
public void GetUdiForStylesheet(string path, string expected)
{
var builder = new StylesheetBuilder();
var stylesheet = builder.WithPath(path).Build();
var result = stylesheet.GetUdi();
Assert.AreEqual(expected, result.ToString());
}
[TestCase("script.js", "umb://script/script.js")]
[TestCase("editor\\script.js", "umb://script/editor/script.js")]
[TestCase("editor/script.js", "umb://script/editor/script.js")]
public void GetUdiForScript(string path, string expected)
{
var builder = new ScriptBuilder();
var script = builder.WithPath(path).Build();
var result = script.GetUdi();
Assert.AreEqual(expected, result.ToString());
}
[TestCase("test.cshtml", PartialViewType.PartialView, "umb://partial-view/test.cshtml")]
[TestCase("editor\\test.cshtml", PartialViewType.PartialView, "umb://partial-view/editor/test.cshtml")]
[TestCase("editor/test.cshtml", PartialViewType.PartialView, "umb://partial-view/editor/test.cshtml")]
[TestCase("test.cshtml", PartialViewType.PartialViewMacro, "umb://partial-view-macro/test.cshtml")]
[TestCase("editor\\test.cshtml", PartialViewType.PartialViewMacro, "umb://partial-view-macro/editor/test.cshtml")]
[TestCase("editor/test.cshtml", PartialViewType.PartialViewMacro, "umb://partial-view-macro/editor/test.cshtml")]
public void GetUdiForPartialView(string path, PartialViewType viewType, string expected)
{
var builder = new PartialViewBuilder();
var partialView = builder
.WithPath(path)
.WithViewType(viewType)
.Build();
var result = partialView.GetUdi();
Assert.AreEqual(expected, result.ToString());
}
}