Ticket #6191: admin_delete.2.patch

tests/regressiontests/views/fixtures/testdata.json

@@ -28 +28 @@
             "slug": "future_article",
             "date_created": "3000-01-01 21:22:23"
         }
-    }, 
-
+    },
     {
         "pk": 1, 
         "model": "views.author", 
         "fields": {
             "name": "Boris"
         }
-    }, 
+    },
+    {
+        "pk": 2,
+        "model": "views.author",
+        "fields": {
+                "name": "Natasha"
+        }
+    },
+    {
+        "pk": 1,
+        "model": "views.reviewedarticle",
+        "fields": {
+                "author": 1,
+                "reviewer": 2,
+                "title": "Reviewed Article"
+                }
+    },
     {
         "pk": 1, 
         "model": "sites.site", 
@@ -44 +59 @@
             "domain": "testserver", 
             "name": "testserver"
         }
-    }
+    },
+        {
+                "pk": 1,
+                "model": "auth.user",
+                "fields": {
+                        "username": "root",
+                        "first_name": "Super",
+                        "last_name": "User",
+                        "is_active": true,
+                        "is_superuser": true,
+                        "is_staff": true,
+                        "last_login": "2007-12-13 11:49:43",
+                        "groups": [],
+                        "user_permissions": [],
+                        "password": "sha1$3435d$f45ddc0acfa0db94de8ba06d2546d1661dffe6db",
+                        "email": "root@localhost",
+                        "date_joined": "2007-12-13 11:49:43"
+                }
+        }
 ]

tests/regressiontests/views/models.py

@@ -8 +8 @@
 class Author(models.Model):
     name = models.CharField(max_length=100)
 
+    class Admin:
+        pass
+
     def __unicode__(self):
         return self.name
 
     def get_absolute_url(self):
         return '/views/authors/%s/' % self.id
-
 
 class Article(models.Model):
     title = models.CharField(max_length=100)
@@ -24 +26 @@
     def __unicode__(self):
         return self.title
 
+class ReviewedArticle(models.Model):
+    title = models.CharField(max_length=100)
+    author = models.ForeignKey(Author, related_name='authors')
+    reviewer = models.ForeignKey(Author, related_name='reviewers')
+
+    class Admin:
+        pass
+
+    def __unicode__(self):
+        return self.title

tests/regressiontests/views/tests/__init__.py

@@ -1 +1 @@
 from defaults import *
 from i18n import *
 from static import *
-from generic.date_based import *
- No newline at end of file
+from generic.date_based import *
+from admin import *
+ No newline at end of file

new file tests/regressiontests/views/tests/admin.py

@@ +1 @@
+from django.test import TestCase
+
+class AdminTests(TestCase):
+    fixtures = ['testdata.json']
+
+    def test_delete_stage(self):
+        "Delete stage includes all objects to be deleted"
+        self.assertTrue(self.client.login(username='root', password='password'))
+        response = self.client.get('/views/admin/views/author/2/delete/')
+        self.assertContains(response, "Reviewed Article")

tests/regressiontests/views/urls.py

@@ -44 +44 @@
         dict(allow_future=True, slug_field='slug', **date_based_info_dict)), 
     (r'^date_based/archive_month/(?P<year>\d{4})/(?P<month>\d{1,2})/$', 
         'django.views.generic.date_based.archive_month', 
-        date_based_info_dict),     
+        date_based_info_dict),
+
+    # Admin views
+    (r'^admin/', include('django.contrib.admin.urls')),
 )