Fixed #13790 -- auto detection of m2m fields to Site. Thanks, gabrielhurley!

Tests are placed in the test suite and not the contrib app since they require
models to work

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14251 bcc190cf-cafb-0310-a4f2-bffc1f526a37

tests/regressiontests/sites_framework/models.py

@@ -0,0 +1,36 @@
+from django.contrib.sites.managers import CurrentSiteManager
+from django.contrib.sites.models import Site
+from django.db import models
+
+class AbstractArticle(models.Model):
+    title = models.CharField(max_length=50)
+
+    objects = models.Manager()
+    on_site = CurrentSiteManager()
+
+    class Meta:
+        abstract = True
+
+    def __unicode__(self):
+        return self.title
+
+class SyndicatedArticle(AbstractArticle):
+    sites = models.ManyToManyField(Site)
+
+class ExclusiveArticle(AbstractArticle):
+    site = models.ForeignKey(Site)
+
+class CustomArticle(AbstractArticle):
+    places_this_article_should_appear = models.ForeignKey(Site)
+
+    objects = models.Manager()
+    on_site = CurrentSiteManager("places_this_article_should_appear")
+
+class InvalidArticle(AbstractArticle):
+    site = models.ForeignKey(Site)
+
+    objects = models.Manager()
+    on_site = CurrentSiteManager("places_this_article_should_appear")
+
+class ConfusedArticle(AbstractArticle):
+    site = models.IntegerField()

tests/regressiontests/sites_framework/tests.py

@@ -0,0 +1,34 @@
+from django.conf import settings
+from django.contrib.sites.models import Site
+from django.test import TestCase
+
+from models import SyndicatedArticle, ExclusiveArticle, CustomArticle, InvalidArticle, ConfusedArticle
+
+class SitesFrameworkTestCase(TestCase):
+    def setUp(self):
+        Site.objects.get_or_create(id=settings.SITE_ID, domain="example.com", name="example.com")
+        Site.objects.create(id=settings.SITE_ID+1, domain="example2.com", name="example2.com")
+        
+    def test_site_fk(self):
+        article = ExclusiveArticle.objects.create(title="Breaking News!", site_id=settings.SITE_ID)
+        self.assertEqual(ExclusiveArticle.on_site.all().get(), article)
+    
+    def test_sites_m2m(self):
+        article = SyndicatedArticle.objects.create(title="Fresh News!")
+        article.sites.add(Site.objects.get(id=settings.SITE_ID))
+        article.sites.add(Site.objects.get(id=settings.SITE_ID+1))
+        article2 = SyndicatedArticle.objects.create(title="More News!")
+        article2.sites.add(Site.objects.get(id=settings.SITE_ID+1))
+        self.assertEqual(SyndicatedArticle.on_site.all().get(), article)
+        
+    def test_custom_named_field(self):
+        article = CustomArticle.objects.create(title="Tantalizing News!", places_this_article_should_appear_id=settings.SITE_ID)
+        self.assertEqual(CustomArticle.on_site.all().get(), article)
+    
+    def test_invalid_name(self):
+        article = InvalidArticle.objects.create(title="Bad News!", site_id=settings.SITE_ID)
+        self.assertRaises(ValueError, InvalidArticle.on_site.all)
+        
+    def test_invalid_field_type(self):
+        article = ConfusedArticle.objects.create(title="More Bad News!", site=settings.SITE_ID)
+        self.assertRaises(TypeError, ConfusedArticle.on_site.all)