diff options
author | humbertotm <humberto.htm@gmail.com> | 2018-05-28 19:59:03 -0700 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2018-06-03 21:00:28 -0400 |
commit | 747ff7a30b79e12d344169200de24f88a22ddee9 (patch) | |
tree | c0e40c0ce672866b3d613157d0641dddfa93ce76 /tests/admin_docs | |
parent | 085ebc5f1a0e96784516e551cb9225cc6836f1d0 (diff) | |
download | django-747ff7a30b79e12d344169200de24f88a22ddee9.tar.gz |
Fixed #29385 -- Made admindocs ModelDetailView show model properties.
Original patch by bkaluza. Tests and docs by humbertotm.
Diffstat (limited to 'tests/admin_docs')
-rw-r--r-- | tests/admin_docs/models.py | 4 | ||||
-rw-r--r-- | tests/admin_docs/test_views.py | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/admin_docs/models.py b/tests/admin_docs/models.py index a425ae0fcd..02bf1efa9f 100644 --- a/tests/admin_docs/models.py +++ b/tests/admin_docs/models.py @@ -52,6 +52,10 @@ class Person(models.Model): def dummy_function(self, baz, rox, *some_args, **some_kwargs): return some_kwargs + @property + def a_property(self): + return 'a_property' + def suffix_company_name(self, suffix='ltd'): return self.company.name + suffix diff --git a/tests/admin_docs/test_views.py b/tests/admin_docs/test_views.py index c55891a3c0..05e1f6b329 100644 --- a/tests/admin_docs/test_views.py +++ b/tests/admin_docs/test_views.py @@ -208,6 +208,10 @@ class TestModelDetailView(TestDataMixin, AdminDocsTestCase): """ self.assertContains(self.response, "<td>baz, rox, *some_args, **some_kwargs</td>") + def test_instance_of_property_methods_are_displayed(self): + """Model properties are displayed as fields.""" + self.assertContains(self.response, '<td>a_property</td>') + def test_method_data_types(self): company = Company.objects.create(name="Django") person = Person.objects.create(first_name="Human", last_name="User", company=company) |