Merge pull request #5 from jrobichaud/upgrade-requirements

Upgrade requirements

requirements.txt

@@ -1,6 +1,6 @@
 # Django==2.0.1
 Django>=1.11,<2
-factory-boy==2.8.1
-Faker==0.9.1
+factory-boy==2.11.1
+Faker==1.0.2
 
 -r testing_migrations/requirements.txt

tests/factories.py

@@ -42,15 +42,6 @@ class EntryFactory(factory.DjangoModelFactory):
     class Meta:
         model = models.Entry
 
-    class Params:
-        with_authors = factory.Trait(
-            authors=factory.LazyFunction(
-                lambda: tuple(
-                    AuthorFactory.create_batch(random.randint(1, 10))
-                )
-            )
-        )
-
     blog = factory.SubFactory(BlogFactory)
     headline = factory.Faker('sentence', nb_words=4)
     body_text = factory.Faker('paragraphs', nb=4)
@@ -62,16 +53,25 @@ class Params:
         )
     )
 
+    @factory.post_generation
+    def with_authors(self, create, extracted, **kwargs):
+        if extracted and create:
+            EntryFactory.create_authors(
+                self,
+                create,
+                AuthorFactory.create_batch(random.randint(1, 10))
+            )
+
     @factory.post_generation
     def authors(self, create, extracted, **kwargs):
-        if not create:
-            # Simple build, do nothing.
-            return
+        EntryFactory.create_authors(self, create, extracted)
 
-        if extracted:
+    @staticmethod
+    def create_authors(obj, create, extracted):
+        if extracted and create:
             # A list of authors were passed in, use them
             for author in extracted:
-                self.authors.add(author)
+                obj.authors.add(author)
 
     n_comments = factory.Faker('pyint')
     n_pingbacks = factory.Faker('pyint')