diff options
| author | Tom Christie | 2015-01-05 11:02:28 +0000 |
|---|---|---|
| committer | Tom Christie | 2015-01-05 11:02:28 +0000 |
| commit | 6168f60ba80a84768172437c09957c1fab05f014 (patch) | |
| tree | 4922399b5996d6cd0fdeb4aad2fbb99698f3a1c8 /tests/test_model_serializer.py | |
| parent | 889a0bdeca942995ab32bf19c3d9fdbfaeec58ec (diff) | |
| parent | 8cf37449715c32c4a692667814466c7f32e8734f (diff) | |
| download | django-rest-framework-6168f60ba80a84768172437c09957c1fab05f014.tar.bz2 | |
Merge branch 'master' into version-3.1
Diffstat (limited to 'tests/test_model_serializer.py')
| -rw-r--r-- | tests/test_model_serializer.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 603faf47..db0f2e6f 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -119,7 +119,7 @@ class TestRegularFieldMappings(TestCase): positive_small_integer_field = IntegerField() slug_field = SlugField(max_length=100) small_integer_field = IntegerField() - text_field = CharField(style={'type': 'textarea'}) + text_field = CharField(style={'base_template': 'textarea.html'}) time_field = TimeField() url_field = URLField(max_length=100) custom_field = ModelField(model_field=<tests.test_model_serializer.CustomField: custom_field>) |