diff options
| author | José Padilla | 2015-02-01 15:34:33 -0400 |
|---|---|---|
| committer | José Padilla | 2015-02-01 15:34:33 -0400 |
| commit | b844cc4bb6b53e2bac4ce1351b22f44a82b7b937 (patch) | |
| tree | f508468e09d32d1e4a4283ddce7e71a16526afa2 /tests | |
| parent | 37dce89354ab2c94fefeb0a20b6265fef98caddc (diff) | |
| parent | e63f49bd1d55501f766ca2e3f9c0c9fa3cfa19ab (diff) | |
| download | django-rest-framework-b844cc4bb6b53e2bac4ce1351b22f44a82b7b937.tar.bz2 | |
Merge remote-tracking branch 'upstream/version-3.1' into version-3.1
Conflicts:
rest_framework/serializers.py
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_generics.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_generics.py b/tests/test_generics.py index fba8718f..88e792ce 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -483,7 +483,7 @@ class TestFilterBackendAppliedToViews(TestCase): request = factory.get('/1') response = instance_view(request, pk=1).render() self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) - self.assertEqual(response.data, {'detail': 'Not found'}) + self.assertEqual(response.data, {'detail': 'Not found.'}) def test_get_instance_view_will_return_single_object_when_filter_does_not_exclude_it(self): """ |
