Review applied

polymorphic/tests/migrations/0001_initial.py

@@ -1074,7 +1074,6 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=30)),
-                ('weight', models.IntegerField()),
                 ('polymorphic_ctype',
                  models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE,
                                    related_name='polymorphic_tests.duck_set+', to='contenttypes.ContentType')),
@@ -1114,7 +1113,7 @@ class Migration(migrations.Migration):
                                     to='contenttypes.ContentType'),
         ),
         migrations.CreateModel(
-            name='ReadheadDuck',
+            name='RedheadDuck',
             fields=[
             ],
             options={

polymorphic/tests/models.py

@@ -443,10 +443,9 @@ class ArtProject(AbstractProject):
 
 class Duck(PolymorphicModel):
     name = models.CharField(max_length=30)
-    weight = models.IntegerField()
 
 
-class ReadheadDuck(Duck):
+class RedheadDuck(Duck):
 
     class Meta:
         proxy = True

polymorphic/tests/test_orm.py

@@ -68,7 +68,7 @@ from polymorphic.tests.models import (
     ProxyModelB,
     ProxyModelBase,
     QuerySet,
-    ReadheadDuck,
+    RedheadDuck,
     RelationA,
     RelationB,
     RelationBC,
@@ -969,19 +969,19 @@ class PolymorphicTests(TransactionTestCase):
         )
 
     def test_bulk_create_proxy_inheritance(self):
-        ReadheadDuck.objects.bulk_create([
-            ReadheadDuck(name='readheadduck1', weight=1),
-            Duck(name='duck1', weight=1),
-            RubberDuck(name='rubberduck1', weight=1),
+        RedheadDuck.objects.bulk_create([
+            RedheadDuck(name='redheadduck1'),
+            Duck(name='duck1'),
+            RubberDuck(name='rubberduck1'),
         ])
         RubberDuck.objects.bulk_create([
-            ReadheadDuck(name='readheadduck2', weight=1),
-            RubberDuck(name='rubberduck2', weight=1),
-            Duck(name='duck2', weight=1),
+            RedheadDuck(name='redheadduck2'),
+            RubberDuck(name='rubberduck2'),
+            Duck(name='duck2'),
         ])
         self.assertEqual(
-            sorted(ReadheadDuck.objects.values_list('name', flat=True)),
-            ['readheadduck1', 'readheadduck2'],
+            sorted(RedheadDuck.objects.values_list('name', flat=True)),
+            ['redheadduck1', 'redheadduck2'],
         )
         self.assertEqual(
             sorted(RubberDuck.objects.values_list('name', flat=True)),
@@ -989,12 +989,11 @@ class PolymorphicTests(TransactionTestCase):
         )
         self.assertEqual(
             sorted(Duck.objects.values_list('name', flat=True)),
-            ['duck1', 'duck2', 'readheadduck1', 'readheadduck2', 'rubberduck1', 'rubberduck2'],
+            ['duck1', 'duck2', 'redheadduck1', 'redheadduck2', 'rubberduck1', 'rubberduck2'],
         )
 
     def test_bulk_create_unsupported_multi_table_inheritance(self):
-        expected_message = 'Can\'t bulk create a multi-table inherited model'
-        with self.assertRaisesMessage(ValueError, expected_message):
+        with self.assertRaises(ValueError):
             MultiTableDerived.objects.bulk_create([
                 MultiTableDerived(field1='field1', field2='field2')
             ])