Fix date filter not using context settings

sebastienros · Mar 9, 2021 · 0ef19d3 · 0ef19d3
1 parent 46d76d5
commit 0ef19d3
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/Fluid.Tests/TemplateContextTests.cs b/Fluid.Tests/TemplateContextTests.cs
@@ -1,4 +1,6 @@
 using Fluid.Values;
+using System;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
@@ -22,7 +24,6 @@ private static async Task Register()
             templateContext.Options.MemberAccessStrategy.Register(typeof(TestClass));
         }
 
-
         [Fact]
         public void ScopeShouldFallbackToTemplateOptions()
         {
@@ -43,6 +44,40 @@ public void ScopeShouldFallbackToTemplateOptions()
             Assert.Equal("o3", context.GetValue("o3").ToStringValue());
         }
 
+        [Fact]
+        public void CustomContextShouldNotUseTemplateOptionsProperties()
+        {
+            var parser = new FluidParser();
+
+            var options = new TemplateOptions();
+
+            var context = new TemplateContext(options);
+            context.TimeZone = TimeZoneInfo.Utc;
+            context.CultureInfo = new CultureInfo("fr-FR");
+            context.Now = () => new DateTime(2020, 01, 01);
+
+            Assert.Equal(TimeZoneInfo.Utc, context.TimeZone);
+            Assert.Equal(new CultureInfo("fr-FR"), context.CultureInfo);
+            Assert.Equal(new DateTime(2020, 01, 01), context.Now());
+        }
+
+        [Fact]
+        public void DefaultContextShouldUseTemplateOptionsProperties()
+        {
+            var parser = new FluidParser();
+
+            var options = new TemplateOptions();
+            options.TimeZone = TimeZoneInfo.Utc;
+            options.CultureInfo = new CultureInfo("fr-FR");
+            options.Now = () => new DateTime(2020, 01, 01);
+
+            var context = new TemplateContext(options);
+
+            Assert.Equal(TimeZoneInfo.Utc, context.TimeZone);
+            Assert.Equal(new CultureInfo("fr-FR"), context.CultureInfo);
+            Assert.Equal(new DateTime(2020, 01, 01), context.Now());
+        }
+
         [Fact]
         public void UseDifferentModelsWithSameMemberName()
         {

diff --git a/Fluid/Filters/MiscFilters.cs b/Fluid/Filters/MiscFilters.cs
@@ -467,7 +467,7 @@ public static ValueTask<FluidValue> FormatDate(FluidValue input, FilterArguments
 
         private static bool TryGetDateTimeInput(FluidValue input, TemplateContext context, out DateTimeOffset result)
         {
-            result = context.Options.Now();
+            result = context.Now();
 
             if (input.Type == FluidValues.String)
             {