Add more tests (#296)

* Add more tests

* Fix

djmoney/admin.py

@@ -1,5 +1,6 @@
 # coding: utf-8
 import django.contrib.admin.utils as admin_utils
+from django import VERSION
 
 from ._compat import text_type
 from .models.fields import MoneyField
@@ -8,9 +9,18 @@
 def setup_admin_integration():
     original_display_for_field = admin_utils.display_for_field
 
-    def display_for_field(value, field, empty):
-        if isinstance(field, MoneyField):
-            return text_type(value)
-        return original_display_for_field(value, field, empty)
+    if VERSION[:2] == (1, 8):
+
+        def display_for_field(value, field):
+            if isinstance(field, MoneyField):
+                return text_type(value)
+            return original_display_for_field(value, field)
+
+    else:
+
+        def display_for_field(value, field, empty):
+            if isinstance(field, MoneyField):
+                return text_type(value)
+            return original_display_for_field(value, field, empty)
 
     admin_utils.display_for_field = display_for_field

djmoney/forms/widgets.py

@@ -9,11 +9,9 @@
 
 class MoneyWidget(MultiWidget):
 
-    def __init__(self, choices=CURRENCY_CHOICES, amount_widget=None, currency_widget=None, default_currency=None,
+    def __init__(self, choices=CURRENCY_CHOICES, amount_widget=TextInput, currency_widget=None, default_currency=None,
                  *args, **kwargs):
         self.default_currency = default_currency
-        if not amount_widget:
-            amount_widget = TextInput
         if not currency_widget:
             currency_widget = Select(choices=choices)
         widgets = (amount_widget, currency_widget)

tests/test_admin.py

@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 import django.contrib.admin.utils as admin_utils
+from django import VERSION
 
 import pytest
 
@@ -11,6 +12,16 @@
 
 
 MONEY_FIELD = ModelWithVanillaMoneyField._meta.get_field('money')
+INTEGER_FIELD = ModelWithVanillaMoneyField._meta.get_field('integer')
+
+
+def get_args(value, field):
+    """
+    Constructs arguments for `display_for_field`.
+    """
+    if VERSION[:2] == (1, 8):
+        return value, field
+    return value, field, ''
 
 
 @pytest.mark.parametrize('value, kwargs, expected', (
@@ -23,4 +34,8 @@
 def test_display_for_field(settings, value, kwargs, expected):
     for k, v in kwargs.items():
         setattr(settings, k, v)
-    assert admin_utils.display_for_field(value, MONEY_FIELD, '') == expected
+    assert admin_utils.display_for_field(*get_args(value, MONEY_FIELD)) == expected
+
+
+def test_default_display():
+    assert admin_utils.display_for_field(*get_args(10, INTEGER_FIELD)) == '10'