Better slugify tests; remove dupliate banned character

Kwpolska · Kwpolska · commit 6de860b2d72d · 2015-07-11T12:18:58.000+02:00
Signed-off-by: Chris Warrick &lt;kwpolska@gmail.com&gt;
diff --git a/nikola/utils.py b/nikola/utils.py
@@ -740,7 +740,7 @@ def slugify(value, force=False):
         # We still replace some characters, though.  In particular, we need
         # to replace ? and #, which should not appear in URLs, and some
         # Windows-unsafe characters.  This list might be even longer.
-        rc = '/\\?#"\'\r\n\t*:<>|"'
+        rc = '/\\?#"\'\r\n\t*:<>|'
 
         for c in rc:
             value = value.replace(c, '-')
diff --git a/tests/test_slugify.py b/tests/test_slugify.py
@@ -1,36 +1,65 @@
 # -*- coding: utf-8 -*-
+
+u"""Test slugify."""
+
+from __future__ import unicode_literals
 import nikola.utils
 
+
 def test_ascii():
-    o = nikola.utils.slugify(u'abcdef')
-    assert o == u'abcdef'
+    """Test an ASCII-only string."""
+    o = nikola.utils.slugify(u'hello')
+    assert o == u'hello'
     assert isinstance(o, nikola.utils.unicode_str)
 
+
 def test_ascii_dash():
-    o = nikola.utils.slugify(u'abc-def')
-    assert o == u'abc-def'
+    """Test an ASCII string, with dashes."""
+    o = nikola.utils.slugify(u'hello-world')
+    assert o == u'hello-world'
+    assert isinstance(o, nikola.utils.unicode_str)
+
+
+def test_ascii_fancy():
+    """Test an ASCII string, with fancy characters."""
+    o = nikola.utils.slugify(u'The quick brown fox jumps over the lazy dog!-123.456')
+    assert o == u'the-quick-brown-fox-jumps-over-the-lazy-dog-123456'
     assert isinstance(o, nikola.utils.unicode_str)
 
+
 def test_pl():
-    o = nikola.utils.slugify(u'ąbćdef')
-    assert o == u'abcdef'
+    """Test a string with Polish diacritical characters."""
+    o = nikola.utils.slugify(u'zażółćgęśląjaźń')
+    assert o == u'zazolcgeslajazn'
     assert isinstance(o, nikola.utils.unicode_str)
 
+
 def test_pl_dash():
-    o = nikola.utils.slugify(u'ąbć-def')
-    assert o == u'abc-def'
+    """Test a string with Polish diacritical characters and dashes."""
+    o = nikola.utils.slugify(u'zażółć-gęślą-jaźń')
+    assert o == u'zazolc-gesla-jazn'
+
+
+def test_pl_fancy():
+    """Test a string with Polish diacritical characters and fancy characters."""
+    o = nikola.utils.slugify(u'Zażółć gęślą jaźń!-123.456')
+    assert o == u'zazolc-gesla-jazn-123456'
     assert isinstance(o, nikola.utils.unicode_str)
 
+
 def test_disarmed():
+    """Test disarmed slugify."""
     nikola.utils.USE_SLUGIFY = False
-    o = nikola.utils.slugify(u'ąbć-def')
-    assert o == u'ąbć-def'
+    o = nikola.utils.slugify(u'Zażółć gęślą jaźń!-123.456')
+    assert o == u'Zażółć gęślą jaźń!-123.456'
     assert isinstance(o, nikola.utils.unicode_str)
     nikola.utils.USE_SLUGIFY = True
 
+
 def test_disarmed_weird():
+    """Test disarmed slugify with banned characters."""
     nikola.utils.USE_SLUGIFY = False
-    o = nikola.utils.slugify(u'ąbć-def "Hello World"?#H<e>l/l\\o:W\'o\rr*l\td|!\n')
-    assert o == u'ąbć-def -Hello World---H-e-l-l-o-W-o-r-l-d-!-'
+    o = nikola.utils.slugify(u'Zażółć gęślą jaźń!-123.456 "Hello World"?#H<e>l/l\\o:W\'o\rr*l\td|!\n')
+    assert o == u'Zażółć gęślą jaźń!-123.456 -Hello World---H-e-l-l-o-W-o-r-l-d-!-'
     assert isinstance(o, nikola.utils.unicode_str)
     nikola.utils.USE_SLUGIFY = True
