lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

#17217: Exception thrown if a theme includes a static resource with the same name as a static resource in its BaseTheme (and varies by case)

Browse Source 
--HG--
branch : dev
This commit is contained in:
Dave Reed
2011-01-31 12:47:10 -08:00
parent 1372fe250d
commit 92ef22bd58
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Orchard.Tests/DisplayManagement/Descriptors/StylesheetBindingStrategyTests.cs
View File

@@ -25,7 +25,7 @@ namespace Orchard.Tests.DisplayManagement.Descriptors {
protected override void Register(Autofac.ContainerBuilder builder) { protected override void Register(Autofac.ContainerBuilder builder) {
_descriptor = new ShellDescriptor { }; _descriptor = new ShellDescriptor { };
_testViewEngine = new TestViewEngine(); _testViewEngine = new TestViewEngine();
_testVirtualPathProvider = new TestVirtualPathProvider(); _testVirtualPathProvider = new TestVirtualPathProvider { TestViewEngine = _testViewEngine };
builder.Register(ctx => _descriptor); builder.Register(ctx => _descriptor);
builder.RegisterType<StylesheetBindingStrategy>().As<IShapeTableProvider>(); builder.RegisterType<StylesheetBindingStrategy>().As<IShapeTableProvider>();
@@ -44,6 +44,8 @@ namespace Orchard.Tests.DisplayManagement.Descriptors {
} }
public class TestVirtualPathProvider : IVirtualPathProvider { public class TestVirtualPathProvider : IVirtualPathProvider {
public TestViewEngine TestViewEngine { get; set; }
public string Combine(params string[] paths) { public string Combine(params string[] paths) {
throw new NotImplementedException(); throw new NotImplementedException();
} }
@@ -89,7 +91,7 @@ namespace Orchard.Tests.DisplayManagement.Descriptors {
} }
public IEnumerable<string> ListFiles(string path) { public IEnumerable<string> ListFiles(string path) {
return new List<string> {"~/Modules/Alpha/Styles/AlphaStyle.css"}; return TestViewEngine.Keys.Select(o => o.ToString());
} }
public IEnumerable<string> ListDirectories(string path) { public IEnumerable<string> ListDirectories(string path) {
@@ -129,6 +131,7 @@ namespace Orchard.Tests.DisplayManagement.Descriptors {
AddEnabledFeature("Alpha"); AddEnabledFeature("Alpha");
_testViewEngine.Add("~/Modules/Alpha/Styles/AlphaShape.css", null); _testViewEngine.Add("~/Modules/Alpha/Styles/AlphaShape.css", null);
_testViewEngine.Add("~/Modules/Alpha/Styles/alpha-shape.css", null);
var strategy = _container.Resolve<IShapeTableProvider>(); var strategy = _container.Resolve<IShapeTableProvider>();
IList<ShapeAlterationBuilder> alterationBuilders = new List<ShapeAlterationBuilder>(); IList<ShapeAlterationBuilder> alterationBuilders = new List<ShapeAlterationBuilder>();
@@ -137,6 +140,15 @@ namespace Orchard.Tests.DisplayManagement.Descriptors {
var alterations = alterationBuilders.Select(alterationBuilder=>alterationBuilder.Build()); var alterations = alterationBuilders.Select(alterationBuilder=>alterationBuilder.Build());
Assert.That(alterations.Any(alteration => alteration.ShapeType == "Style")); Assert.That(alterations.Any(alteration => alteration.ShapeType == "Style"));
var descriptor = new ShapeDescriptor { ShapeType = "Style" };
alterations.Aggregate(descriptor, (d, alteration) => {
alteration.Alter(d);
return d;
});
var keys = descriptor.Bindings.Select(b => b.Key);
Assert.That(keys.Count() == keys.Select(k => k.ToLowerInvariant()).Distinct().Count(), "Descriptors should never vary by case only.");
} }
} }

2
src/Orchard/DisplayManagement/Descriptors/ResourceBindingStrategy/StylesheetBindingStrategy.cs
View File

@@ -27,7 +27,7 @@ namespace Orchard.DisplayManagement.Descriptors.ResourceBindingStrategy {
private static string SafeName(string name) { private static string SafeName(string name) {
if (string.IsNullOrWhiteSpace(name)) if (string.IsNullOrWhiteSpace(name))
return String.Empty; return String.Empty;
return _safeName.Replace(name, String.Empty); return _safeName.Replace(name, String.Empty).ToLowerInvariant();
} }
public static string GetAlternateShapeNameFromFileName(string fileName) { public static string GetAlternateShapeNameFromFileName(string fileName) {