Newly created tags use the same empty-element rules as the builder used to originally create the soup.

2 files changed, 35 insertions, 5 deletions

diff --git a/bs4/tests/test_builder_registry.py b/bs4/tests/test_builder_registry.py
index 4a60bc1..5f60462 100644
--- a/bs4/tests/test_builder_registry.py
+++ b/bs4/tests/test_builder_registry.py
@@ -17,6 +17,12 @@ try:
 except ImportError:
     HTML5LIB_PRESENT = False
 
+try:
+    from bs4.builder import LXMLTreeBuilder
+    LXML_PRESENT = True
+except ImportError:
+    LXML_PRESENT = False
+
 
 class BuiltInRegistryTest(unittest.TestCase):
     """Test the built-in registry with the default builders registered."""
@@ -29,14 +35,14 @@ class BuiltInRegistryTest(unittest.TestCase):
         self.assertEqual(registry.lookup('strict', 'html'),
                           HTMLParserTreeBuilder)
         if HTML5LIB_PRESENT:
-            self.assertEqual(registry.lookup('permissive', 'html'),
+            self.assertEqual(registry.lookup('html5lib', 'html'),
                               HTML5TreeBuilder)
 
     def test_lookup_by_markup_type(self):
-        if HTML5LIB_PRESENT:
-            self.assertEqual(registry.lookup('html'), HTML5TreeBuilder)
-        else:
+        if LXML_PRESENT:
             self.assertEqual(registry.lookup('html'), LXMLTreeBuilder)
+        else:
+            self.assertEqual(registry.lookup('html'), HTML5TreeBuilder)
         self.assertEqual(registry.lookup('xml'), LXMLTreeBuilderForXML)
 
     def test_named_library(self):
diff --git a/bs4/tests/test_tree.py b/bs4/tests/test_tree.py
index 97dc5e6..692260c 100644
--- a/bs4/tests/test_tree.py
+++ b/bs4/tests/test_tree.py
@@ -15,7 +15,7 @@ import re
 import warnings
 from bs4 import BeautifulSoup
 from bs4.builder import builder_registry
-from bs4.element import CData, SoupStrainer, Tag
+from bs4.element import CData, NavigableString, SoupStrainer, Tag
 from bs4.testing import SoupTest
 
 class TreeTest(SoupTest):
@@ -535,6 +535,30 @@ class TestTagCreation(SoupTest):
         self.assertEqual(dict(bar="baz"), new_tag.attrs)
         self.assertEqual(None, new_tag.parent)
 
+    def test_tag_inherits_self_closing_rules_from_builder(self):
+        xml_soup = BeautifulSoup("", "xml")
+        xml_br = xml_soup.new_tag("br")
+        xml_p = xml_soup.new_tag("p")
+
+        # Both the <br> and <p> tag are empty-element, just because
+        # they have no contents.
+        self.assertEqual(b"<br />", xml_br.encode())
+        self.assertEqual(b"<p />", xml_p.encode())
+
+        html_soup = BeautifulSoup("", "html")
+        html_br = html_soup.new_tag("br")
+        html_p = html_soup.new_tag("p")
+
+        # The HTML builder users HTML's rules about which tags are
+        # empty-element tags, and the new tags reflect these rules.
+        self.assertEqual(b"<br />", html_br.encode())
+        self.assertEqual(b"<p></p>", html_p.encode())
+
+    def test_new_string_creates_navigablestring(self):
+        soup = self.soup("")
+        s = soup.new_string("foo")
+        self.assertEqual("foo", s)
+        self.assertTrue(isinstance(s, NavigableString))
 
 class TestTreeModification(SoupTest):