mirror of
https://github.com/jazzband/django-admin2.git
synced 2026-05-28 00:24:07 +00:00
fixed deprecation warning in admin2tags tests
This commit is contained in:
parent
09545a663e
commit
ffb7f2d595
1 changed files with 10 additions and 10 deletions
|
|
@ -22,56 +22,56 @@ class TagsTests(TestCase):
|
||||||
self.instance = TagsTestsModel()
|
self.instance = TagsTestsModel()
|
||||||
|
|
||||||
def test_admin2_urlname(self):
|
def test_admin2_urlname(self):
|
||||||
self.assertEquals(
|
self.assertEqual(
|
||||||
"admin2:None_None_index",
|
"admin2:None_None_index",
|
||||||
admin2_tags.admin2_urlname(IndexView, "index")
|
admin2_tags.admin2_urlname(IndexView, "index")
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_model_verbose_name_as_model_class(self):
|
def test_model_verbose_name_as_model_class(self):
|
||||||
self.assertEquals(
|
self.assertEqual(
|
||||||
TagsTestsModel._meta.verbose_name,
|
TagsTestsModel._meta.verbose_name,
|
||||||
admin2_tags.model_verbose_name(TagsTestsModel)
|
admin2_tags.model_verbose_name(TagsTestsModel)
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_model_verbose_name_as_model_instance(self):
|
def test_model_verbose_name_as_model_instance(self):
|
||||||
self.assertEquals(
|
self.assertEqual(
|
||||||
self.instance._meta.verbose_name,
|
self.instance._meta.verbose_name,
|
||||||
admin2_tags.model_verbose_name(self.instance)
|
admin2_tags.model_verbose_name(self.instance)
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_model_verbose_name_plural_as_model_class(self):
|
def test_model_verbose_name_plural_as_model_class(self):
|
||||||
self.assertEquals(
|
self.assertEqual(
|
||||||
TagsTestsModel._meta.verbose_name_plural,
|
TagsTestsModel._meta.verbose_name_plural,
|
||||||
admin2_tags.model_verbose_name_plural(TagsTestsModel)
|
admin2_tags.model_verbose_name_plural(TagsTestsModel)
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_model_verbose_name_plural_as_model_instance(self):
|
def test_model_verbose_name_plural_as_model_instance(self):
|
||||||
self.assertEquals(
|
self.assertEqual(
|
||||||
self.instance._meta.verbose_name_plural,
|
self.instance._meta.verbose_name_plural,
|
||||||
admin2_tags.model_verbose_name_plural(self.instance)
|
admin2_tags.model_verbose_name_plural(self.instance)
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_model_field_verbose_name_autogenerated(self):
|
def test_model_field_verbose_name_autogenerated(self):
|
||||||
self.assertEquals(
|
self.assertEqual(
|
||||||
'field1',
|
'field1',
|
||||||
admin2_tags.model_attr_verbose_name(self.instance, 'field1')
|
admin2_tags.model_attr_verbose_name(self.instance, 'field1')
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_model_field_verbose_name_overridden(self):
|
def test_model_field_verbose_name_overridden(self):
|
||||||
self.assertEquals(
|
self.assertEqual(
|
||||||
'second field',
|
'second field',
|
||||||
admin2_tags.model_attr_verbose_name(self.instance, 'field2')
|
admin2_tags.model_attr_verbose_name(self.instance, 'field2')
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_model_method_verbose_name(self):
|
def test_model_method_verbose_name(self):
|
||||||
self.assertEquals(
|
self.assertEqual(
|
||||||
'Published recently?',
|
'Published recently?',
|
||||||
admin2_tags.model_attr_verbose_name(self.instance, 'was_published_recently')
|
admin2_tags.model_attr_verbose_name(self.instance, 'was_published_recently')
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_formset_visible_fieldlist(self):
|
def test_formset_visible_fieldlist(self):
|
||||||
formset = TagsTestFormSet()
|
formset = TagsTestFormSet()
|
||||||
self.assertEquals(
|
self.assertEqual(
|
||||||
admin2_tags.formset_visible_fieldlist(formset),
|
admin2_tags.formset_visible_fieldlist(formset),
|
||||||
[u'Visible 1', u'Visible 2']
|
[u'Visible 1', u'Visible 2']
|
||||||
)
|
)
|
||||||
|
|
@ -80,7 +80,7 @@ class TagsTests(TestCase):
|
||||||
app_verbose_names = {
|
app_verbose_names = {
|
||||||
u'app_one_label': 'App One Verbose Name',
|
u'app_one_label': 'App One Verbose Name',
|
||||||
}
|
}
|
||||||
self.assertEquals(
|
self.assertEqual(
|
||||||
"App One Verbose Name",
|
"App One Verbose Name",
|
||||||
admin2_tags.verbose_name_for(app_verbose_names, 'app_one_label')
|
admin2_tags.verbose_name_for(app_verbose_names, 'app_one_label')
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue