merging changes to HtmlTagTester

HtmlTags · Oct 12, 2012 · 56511aa · 56511aa
2 parents ba67650 + 6ea8b04
commit 56511aa
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/src/HtmlTags.Testing/HtmlTagTester.cs b/src/HtmlTags.Testing/HtmlTagTester.cs
@@ -321,16 +321,6 @@ public void set_an_attribute_to_null_should_remove_the_attribute()
             tag.HasAttr("name").ShouldBeFalse();
         }
 
-        [Test]
-        public void set_an_attribute_to_empty_string_should_remove_the_attribute()
-        {
-            var tag = new HtmlTag("div");
-            tag.Attr("name", "bill");
-            tag.HasAttr("name").ShouldBeTrue();
-            tag.Attr("name", "");
-            tag.HasAttr("name").ShouldBeFalse();
-        }
-
         [Test]
         public void set_the_class_attribute_to_null_should_remove_all_classes()
         {
@@ -376,7 +366,7 @@ public void retrieve_a_non_existing_attr_should_return_an_empty_string()
             new HtmlTag("div").Attr("new").ShouldEqual(string.Empty);
         }
 
-        [Test]
+        [Test]
         public void boolean_attr() {
             var tag = new HtmlTag("input").BooleanAttr("required");
             tag.HasAttr("required").ShouldBeTrue();
@@ -386,6 +376,27 @@ public void retrieve_a_non_existing_attr_should_return_an_empty_string()
         public void render_boolean_attr() {
             var tag = new HtmlTag("input").BooleanAttr("required");
             tag.ToString().ShouldEqual("<input required />");
+		}
+
+        public void set_an_attribute_to_empty_string_should_not_remove_the_attribute() {
+            var tag = new HtmlTag("div");
+            tag.Attr("name", "bill");
+            tag.HasAttr("name").ShouldBeTrue();
+            tag.Attr("name", string.Empty);
+            tag.HasAttr("name").ShouldBeTrue();
+        }
+
+        [Test]
+        public void retrieve_an_empty_attr_should_return_an_empty_string() {
+            var tag = new HtmlTag("option");
+            tag.Attr("value", string.Empty);
+            tag.Attr("value").ShouldEqual(string.Empty);
+        }
+
+        [Test]
+        public void render_empty_attr() {
+            var tag = new HtmlTag("option").Attr("value", string.Empty);
+            tag.ToString().ShouldEqual("<option value=\"\"></option>");
         }
 
         //

diff --git a/src/HtmlTags/HtmlTag.cs b/src/HtmlTags/HtmlTag.cs
@@ -559,14 +559,18 @@ public HtmlTag UnencodedAttr(string attribute, object value)
 
         private HtmlTag buildAttr(string attribute, object value, bool encode = true)
         {
-            if (value == null || value.Equals(string.Empty))
+            if (value == null)
+            {
+                return RemoveAttr(attribute);
+            }
+            if (value.Equals(string.Empty) && (isCssClassAttr(attribute) || isCssStyleAttr(attribute) || isMetadataAttr(attribute)))
             {
                 return RemoveAttr(attribute);
             }
             if (isCssClassAttr(attribute))
             {
                 AddClass(value.ToString());
-            }   
+            }
             else
             {
                 _htmlAttributes[attribute] = new HtmlAttribute(value.ToString(), encode);