mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-04 10:59:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #7551 -- Made GFK allow None init argument.

Browse source 
Thanks SamBull for the report.
This commit is contained in:
Bouke Haarsma 2013-10-15 17:24:35 +02:00 • committed by Tim Graham
parent 763ac8b642
commit 3918eeb9fd
3 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tests/generic_relations/tests.py
View file

@ -4,11 +4,12 @@ from django import forms
from django.contrib.contenttypes.generic import generic_inlineformset_factory
from django.contrib.contenttypes.models import ContentType
from django.test import TestCase
from django.utils import six
from .models import (TaggedItem, ValuableTaggedItem, Comparison, Animal,
Vegetable, Mineral, Gecko, Rock, ManualPK,
ForProxyModelModel, ForConcreteModelModel,
ProxyRelatedModel, ConcreteRelatedModel)
ProxyRelatedModel, ConcreteRelatedModel, AllowsNullGFK)
class GenericRelationsTests(TestCase):
@ -440,3 +441,17 @@ class ProxyRelatedModelTest(TestCase):
newrel.bases = [base]
newrel = ConcreteRelatedModel.objects.get(pk=newrel.pk)
self.assertEqual(base, newrel.bases.get())
class TestInitWithNoneArgument(TestCase):
def test_none_not_allowed(self):
# TaggedItem requires a content_type, initializing with None should
# raise a ValueError.
with six.assertRaisesRegex(self, ValueError,
'Cannot assign None: "TaggedItem.content_type" does not allow null values'):
TaggedItem(content_object=None)
def test_none_allowed(self):
# AllowsNullGFK doesn't require a content_type, so None argument should
# also be allowed.
AllowsNullGFK(content_object=None)