Merge pull request zostera#199 from NotSqrt/develop

tox, support for input groups in the widgets

Author: Dylan Verheul

bootstrap3/renderers.py

@@ -209,8 +209,8 @@ def __init__(self, field, *args, **kwargs):
         else:
             self.placeholder = ''
 
-        self.addon_before = kwargs.get('addon_before', '')
-        self.addon_after = kwargs.get('addon_after', '')
+        self.addon_before = kwargs.get('addon_before', self.initial_attrs.pop('addon_before', ''))
+        self.addon_after = kwargs.get('addon_after', self.initial_attrs.pop('addon_after', ''))
 
         # These are set in Django or in the global BOOTSTRAP3 settings, and
         # they can be overwritten in the template

bootstrap3/tests.py

@@ -73,6 +73,9 @@ class TestForm(forms.Form):
         widget=forms.CheckboxSelectMultiple,
         help_text='Check as many as you like.',
     )
+    addon = forms.CharField(
+        widget=forms.TextInput(attrs={'addon_before': 'before', 'addon_after': 'after'}),
+    )
 
     required_css_class = 'bootstrap3-req'
 
@@ -211,6 +214,12 @@ def test_field_names(self):
         for field in form:
             self.assertIn('name="%s"' % field.name, res)
 
+    def test_field_addons(self):
+        form = TestForm()
+        res = render_form(form)
+        self.assertIn('<div class="input-group"><span class="input-group-addon">before</span><input', res)
+        self.assertIn('/><span class="input-group-addon">after</span></div>', res)
+
     def test_exclude(self):
         form = TestForm()
         res = render_template(

tox.ini

@@ -0,0 +1,35 @@
+# Tox (http://codespeak.net/~hpk/tox/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+minversion=1.8.0
+envlist =
+    py26-django14,
+    py26-django15,
+
+    py27-django14,
+    py27-django15,
+    py27-django16,
+    py27-django17,
+
+    py32-django15,
+    py32-django16,
+    py32-django17,
+
+    py33-django15,
+    py33-django16,
+    py33-django17,
+
+    py34-django15,
+    py34-django16,
+    py34-django17,
+
+[testenv]
+commands = python manage.py test
+deps =
+    django14: django >=1.4.2,<1.5
+    django15: django >=1.5,<1.6
+    django16: django >=1.6,<1.7
+    django17: django >=1.7,<1.8