Test factories upgraded to use factory-boy>=2.5

machina/test/factories/attachments.py

@@ -15,6 +15,8 @@
 
 
 class AttachmentFactory(factory.DjangoModelFactory):
-    FACTORY_FOR = Attachment
     post = factory.SubFactory(PostFactory)
     comment = faker.text(max_nb_chars=255)
+
+    class Meta:
+        model = Attachment

machina/test/factories/auth.py

@@ -13,12 +13,14 @@
 
 
 class UserFactory(factory.DjangoModelFactory):
-    FACTORY_FOR = User
     username = factory.LazyAttribute(lambda t: faker.user_name())
     email = factory.Sequence(lambda n: 'test{0}@example.com'.format(n))
     password = '1234'
     is_active = True
 
+    class Meta:
+        model = User
+
     @classmethod
     def _prepare(cls, create, **kwargs):
         password = kwargs.pop('password', None)
@@ -31,5 +33,7 @@ def _prepare(cls, create, **kwargs):
 
 
 class GroupFactory(factory.DjangoModelFactory):
-    FACTORY_FOR = Group
     name = factory.Sequence(lambda n: '{}-{}'.format(str(n), faker.job()))
+
+    class Meta:
+        model = Group

machina/test/factories/conversation.py

@@ -21,21 +21,25 @@
 
 
 class TopicFactory(factory.DjangoModelFactory):
-    FACTORY_FOR = Topic
     forum = factory.SubFactory(ForumFactory)
     poster = factory.SubFactory(UserFactory)
     status = Topic.STATUS_CHOICES.topic_unlocked
     subject = factory.LazyAttribute(lambda t: faker.text(max_nb_chars=200))
     slug = factory.LazyAttribute(lambda t: slugify(t.subject))
 
+    class Meta:
+        model = Topic
+
 
 class PostFactory(factory.DjangoModelFactory):
-    FACTORY_FOR = Post
     topic = factory.SubFactory(TopicFactory)
     poster = factory.SubFactory(UserFactory)
     subject = factory.LazyAttribute(lambda t: faker.text(max_nb_chars=200))
     content = fuzzy.FuzzyText(length=255)
 
+    class Meta:
+        model = Post
+
 
 def build_topic(**attrs):
     """Create a new unlocked topic but do not save it."""

machina/test/factories/forum.py

@@ -17,13 +17,15 @@
 
 
 class ForumFactory(factory.DjangoModelFactory):
-    FACTORY_FOR = Forum
     name = faker.text(max_nb_chars=150)
     slug = factory.LazyAttribute(lambda t: slugify(t.name))
 
     # Link forum specific
     link = faker.uri()
 
+    class Meta:
+        model = Forum
+
 
 def build_forum(**attrs):
     """Create a new forum but do not save it."""

machina/test/factories/polls.py

@@ -18,18 +18,24 @@
 
 
 class TopicPollFactory(factory.DjangoModelFactory):
-    FACTORY_FOR = TopicPoll
     topic = factory.SubFactory(TopicFactory)
     question = faker.text(max_nb_chars=200)
 
+    class Meta:
+        model = TopicPoll
+
 
 class TopicPollOptionFactory(factory.DjangoModelFactory):
-    FACTORY_FOR = TopicPollOption
     poll = factory.SubFactory(TopicPollFactory)
     text = faker.text(max_nb_chars=100)
 
+    class Meta:
+        model = TopicPollOption
+
 
 class TopicPollVoteFactory(factory.DjangoModelFactory):
-    FACTORY_FOR = TopicPollVote
     poll_option = factory.SubFactory(TopicPollOptionFactory)
     voter = factory.SubFactory(UserFactory)
+
+    class Meta:
+        model = TopicPollVote

machina/test/factories/tracking.py

@@ -15,12 +15,16 @@
 
 
 class ForumReadTrackFactory(factory.DjangoModelFactory):
-    FACTORY_FOR = ForumReadTrack
     user = factory.SubFactory(UserFactory)
     forum = factory.SubFactory(ForumFactory)
 
+    class Meta:
+        model = ForumReadTrack
+
 
 class TopicReadTrackFactory(factory.DjangoModelFactory):
-    FACTORY_FOR = TopicReadTrack
     user = factory.SubFactory(UserFactory)
     topic = factory.SubFactory(TopicFactory)
+
+    class Meta:
+        model = TopicReadTrack

requirements.txt

@@ -3,8 +3,8 @@ django-nose
 nose>=1.2.1
 spec>=0.11.1,<0.12
 coverage>=3.7,<3.8
-factory-boy>=2.3,<2.4
-fake-factory>=0.4.0,<0.5
+factory-boy>=2.4,<2.6
+fake-factory>=0.5,<0.6
 coveralls>=0.2,<0.3
 mock>=1.0.1,<1.1
 tox>=1.7,<1.8