FallbackConverter converts "on" to true if typeconverter is a Boolean…

…Converter and destintionIsType is bool
NHaml · Sep 23, 2012 · a8590b9 · a8590b9
1 parent df422ec
commit a8590b9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/Nancy.Tests/Unit/ModelBinding/DefaultConverters/FallbackConverterFixture.cs b/src/Nancy.Tests/Unit/ModelBinding/DefaultConverters/FallbackConverterFixture.cs
@@ -54,5 +54,15 @@ public void Should_convert_datetime()
 
             result.ShouldEqual(now);
         }
+
+        [Fact]
+        public void Should_convert_on_to_true_for_bool()
+        {
+            string input = "on";
+
+            var result = (bool)converter.Convert(input, typeof(bool), null);
+
+            result.ShouldBeTrue();
+        }
     }
 }
diff --git a/src/Nancy/ModelBinding/DefaultConverters/FallbackConverter.cs b/src/Nancy/ModelBinding/DefaultConverters/FallbackConverter.cs
@@ -42,6 +42,10 @@ public object Convert(string input, Type destinationType, BindingContext context
             }
             catch (FormatException)
             {
+                if (destinationType == typeof(bool) && converter.GetType() == typeof(BooleanConverter) && input == "on")
+                {
+                    return true;
+                }
                 return null;
             }
         }