diff options
| author | Collin Anderson <cmawebsite@gmail.com> | 2017-06-09 12:36:09 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-06-09 13:28:50 -0400 |
| commit | 7c9cb1ed37354c184fe0438ecae923d5be711c86 (patch) | |
| tree | 32953158d70c189106ab0adfabccb417bcadd345 /tests/admin_utils | |
| parent | 0877989c94130079930419e867ff55fa1fb4f5a0 (diff) | |
Refs #27953 -- Removed hardcoded uses of Model.__str__() in tests.
Diffstat (limited to 'tests/admin_utils')
| -rw-r--r-- | tests/admin_utils/models.py | 3 | ||||
| -rw-r--r-- | tests/admin_utils/test_logentry.py | 16 |
2 files changed, 11 insertions, 8 deletions
diff --git a/tests/admin_utils/models.py b/tests/admin_utils/models.py index dafb24e342..7b9c08a2f7 100644 --- a/tests/admin_utils/models.py +++ b/tests/admin_utils/models.py @@ -18,6 +18,9 @@ class Article(models.Model): hist = models.CharField(max_length=100, verbose_name=_("History")) created = models.DateTimeField(null=True) + def __str__(self): + return self.title + def test_from_model(self): return "nothing" diff --git a/tests/admin_utils/test_logentry.py b/tests/admin_utils/test_logentry.py index ee56f6f1f5..09c09b0ea7 100644 --- a/tests/admin_utils/test_logentry.py +++ b/tests/admin_utils/test_logentry.py @@ -120,23 +120,23 @@ class LogEntryTests(TestCase): json.loads(logentry.change_message), [ {"changed": {"fields": ["domain"]}}, - {"added": {"object": "Article object", "name": "article"}}, - {"changed": {"fields": ["title"], "object": "Article object", "name": "article"}}, - {"deleted": {"object": "Article object", "name": "article"}}, + {"added": {"object": "Added article", "name": "article"}}, + {"changed": {"fields": ["title"], "object": "Changed Title", "name": "article"}}, + {"deleted": {"object": "Title second article", "name": "article"}}, ] ) self.assertEqual( logentry.get_change_message(), - 'Changed domain. Added article "Article object". ' - 'Changed title for article "Article object". Deleted article "Article object".' + 'Changed domain. Added article "Added article". ' + 'Changed title for article "Changed Title". Deleted article "Title second article".' ) with translation.override('fr'): self.assertEqual( logentry.get_change_message(), - "Modification de domain. Ajout de article « Article object ». " - "Modification de title pour l'objet article « Article object ». " - "Suppression de article « Article object »." + "Modification de domain. Ajout de article « Added article ». " + "Modification de title pour l'objet article « Changed Title ». " + "Suppression de article « Title second article »." ) def test_logentry_get_edited_object(self): |
