From faceca7075d72d55f0eebc586049fb634cd46129 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sun, 11 Apr 2010 08:35:04 +0000 Subject: Fixed #13301 -- Corrected problem with capitalization of changelist row headers in admin. Thanks to emyller for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12947 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/admin_util/models.py | 2 +- tests/regressiontests/admin_util/tests.py | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'tests/regressiontests/admin_util') diff --git a/tests/regressiontests/admin_util/models.py b/tests/regressiontests/admin_util/models.py index e81f7bbc25..493e1271ad 100644 --- a/tests/regressiontests/admin_util/models.py +++ b/tests/regressiontests/admin_util/models.py @@ -16,7 +16,7 @@ class Article(models.Model): def test_from_model_with_override(self): return "nothing" - test_from_model_with_override.short_description = "not what you expect" + test_from_model_with_override.short_description = "not What you Expect" class Count(models.Model): num = models.PositiveSmallIntegerField() diff --git a/tests/regressiontests/admin_util/tests.py b/tests/regressiontests/admin_util/tests.py index f874b318f9..5ea0ac585e 100644 --- a/tests/regressiontests/admin_util/tests.py +++ b/tests/regressiontests/admin_util/tests.py @@ -157,7 +157,7 @@ class UtilTests(unittest.TestCase): "another name" ) self.assertEquals( - label_for_field("title2", Article, return_attr=True), + label_for_field("title2", Article, return_attr=True), ("another name", None) ) @@ -179,24 +179,24 @@ class UtilTests(unittest.TestCase): return "nothing" self.assertEquals( label_for_field(test_callable, Article), - "test_callable" + "Test callable" ) self.assertEquals( label_for_field(test_callable, Article, return_attr=True), - ("test_callable", test_callable) + ("Test callable", test_callable) ) self.assertEquals( label_for_field("test_from_model", Article), - "test_from_model" + "Test from model" ) self.assertEquals( label_for_field("test_from_model", Article, return_attr=True), - ("test_from_model", Article.test_from_model) + ("Test from model", Article.test_from_model) ) self.assertEquals( label_for_field("test_from_model_with_override", Article), - "not what you expect" + "not What you Expect" ) self.assertEquals( @@ -207,15 +207,16 @@ class UtilTests(unittest.TestCase): class MockModelAdmin(object): def test_from_model(self, obj): return "nothing" - test_from_model.short_description = "not really the model" + test_from_model.short_description = "not Really the Model" + self.assertEquals( label_for_field("test_from_model", Article, model_admin=MockModelAdmin), - "not really the model" + "not Really the Model" ) self.assertEquals( label_for_field("test_from_model", Article, model_admin = MockModelAdmin, return_attr = True ), - ("not really the model", MockModelAdmin.test_from_model) + ("not Really the Model", MockModelAdmin.test_from_model) ) -- cgit v1.3