p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensured foreign_object tests reset language properly.

This commit is contained in:
Preston Timmons 2014-12-01 22:51:16 -06:00 committed by Tim Graham
parent 5760fe66df
commit 1da1fe8e16
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/foreign_object/tests.py
View File

@ -5,7 +5,7 @@ from .models import (
Country, Person, Group, Membership, Friendship, Article, Country, Person, Group, Membership, Friendship, Article,
ArticleTranslation, ArticleTag, ArticleIdea, NewsArticle) ArticleTranslation, ArticleTag, ArticleIdea, NewsArticle)
from django.test import TestCase, skipUnlessDBFeature from django.test import TestCase, skipUnlessDBFeature
from django.utils.translation import activate from django.utils import translation
from django.core.exceptions import FieldError from django.core.exceptions import FieldError
from django import forms from django import forms
@ -309,8 +309,8 @@ class MultiColumnFKTests(TestCase):
normal_groups_lists = [list(p.groups.all()) for p in Person.objects.all()] normal_groups_lists = [list(p.groups.all()) for p in Person.objects.all()]
self.assertEqual(groups_lists, normal_groups_lists) self.assertEqual(groups_lists, normal_groups_lists)
@translation.override('fi')
def test_translations(self): def test_translations(self):
activate('fi')
a1 = Article.objects.create(pub_date=datetime.date.today()) a1 = Article.objects.create(pub_date=datetime.date.today())
at1_fi = ArticleTranslation(article=a1, lang='fi', title='Otsikko', body='Diipadaapa') at1_fi = ArticleTranslation(article=a1, lang='fi', title='Otsikko', body='Diipadaapa')
at1_fi.save() at1_fi.save()
@ -338,10 +338,11 @@ class MultiColumnFKTests(TestCase):
list(Article.objects.filter(active_translation__abstract=None, list(Article.objects.filter(active_translation__abstract=None,
active_translation__pk__isnull=False)), active_translation__pk__isnull=False)),
[a1]) [a1])
activate('en')
self.assertEqual( with translation.override('en'):
list(Article.objects.filter(active_translation__abstract=None)), self.assertEqual(
[a1, a2]) list(Article.objects.filter(active_translation__abstract=None)),
[a1, a2])
def test_foreign_key_raises_informative_does_not_exist(self): def test_foreign_key_raises_informative_does_not_exist(self):
referrer = ArticleTranslation() referrer = ArticleTranslation()
@ -365,8 +366,8 @@ class MultiColumnFKTests(TestCase):
with self.assertRaises(FieldError): with self.assertRaises(FieldError):
Article.objects.filter(ideas__name="idea1") Article.objects.filter(ideas__name="idea1")
@translation.override('fi')
def test_inheritance(self): def test_inheritance(self):
activate("fi")
na = NewsArticle.objects.create(pub_date=datetime.date.today()) na = NewsArticle.objects.create(pub_date=datetime.date.today())
ArticleTranslation.objects.create( ArticleTranslation.objects.create(
article=na, lang="fi", title="foo", body="bar") article=na, lang="fi", title="foo", body="bar")