Merge pull request #277 from novafloss/use-py.test

Add configuration for py.test

Author: wo0dyn

CHANGELOG.rst

@@ -8,6 +8,8 @@ master (unreleased)
 - Added tests for the validators mapping
 - Minor syntax changes
 - Added perf rec tests
+- Add configuration for py.test
+- Reactivate accidentally skipped ``test_validations.py`` tests
 
 Release 1.0.2 (2017-10-10)
 ==========================

demo/tests/serializers/__init__.py

@@ -12,50 +12,70 @@
 
 
 class ValidationSerializerTest(TestCase):
+    increment = 0
 
     def setUp(self):
-        super(ValidationSerializerTest, self).setUp()
         self.form = Formidable.objects.create(
             label='test', description='test'
         )
-        self.text = self.form.fields.create(
-            type_id='text', slug='input-text', label='name',
+        self.increment += 1
+        self.text_field = self.form.fields.create(
+            type_id='text',
+            slug='input-text-{}'.format(self.increment),
+            label='name',
+            order=1,
         )
 
     def test_int_value(self):
-        data = {'field_id': self.text.id, 'value': 5, 'type': 'minlength'}
+        data = {
+            'field_id': self.text_field.id,
+            'type': 'MINLENGTH',
+            'value': 5,
+        }
         serializer = MinLengthSerializer(data=data)
         self.assertTrue(serializer.is_valid())
 
     def test_non_int_value(self):
-        data = {'field_id': self.text.id, 'value': 'test', 'type': 'minlength'}
+        data = {
+            'field_id': self.text_field.id,
+            'type': 'MINLENGTH',
+            'value': 'test',
+        }
         serializer = MinLengthSerializer(data=data)
         self.assertFalse(serializer.is_valid())
 
     def test_regexp_value(self):
         data = {
-            'field_id': self.text.id, 'value': '\w+ly', 'type': 'minlength'
+            'field_id': self.text_field.id,
+            'type': 'REGEXP',
+            'value': '\w+ly',
         }
         serializer = RegexpSerializer(data=data)
         self.assertTrue(serializer.is_valid())
 
     def test_invalid_regexp_value(self):
         data = {
-            'field_id': self.text.id, 'value': '\w+ly(', 'type': 'minlength'
+            'field_id': self.text_field.id,
+            'type': 'REGEXP',
+            'value': '\w+ly(',
         }
         serializer = RegexpSerializer(data=data)
         self.assertFalse(serializer.is_valid())
 
     def test_update_validations(self):
         list_serializer = ValidationSerializer(many=True)
-        self.text.validations.create(
-            value='5', type='minlength'
+        self.text_field.validations.create(
+            type='MINLENGTH',
+            value='5',
         )
         list_serializer.update(
-            self.text.validations,
-            [{'type': 'minlength', 'value': '12'}],
-            self.text
+            self.text_field.validations,
+            self.text_field,
+            [{
+                'type': 'MINLENGTH',
+                'value': '12'
+            }],
         )
-        self.assertEquals(self.text.validations.count(), 1)
-        validation = self.text.validations.first()
+        self.assertEquals(self.text_field.validations.count(), 1)
+        validation = self.text_field.validations.first()
         self.assertEquals(validation.value, '12')

demo/tests/serializers/tests_validations.py renamed to demo/tests/serializers/test_validations.py

@@ -5,6 +5,9 @@ Developer's documentation
 Testing
 -------
 
+Using tox
+~~~~~~~~~
+
 Tests are launched using `tox <http://tox.readthedocs.io/>`_. You may want to become proficient with this tool but the core command you need to know is:
 
 .. code:: shell
@@ -41,6 +44,26 @@ If somehow you've messed-up with your environment(s), you can still recreate it/
     $ tox -re django18-py27  # recreate and run tests using `django18-py27`
 
 
+Using py.test
+~~~~~~~~~~~~~
+
+You can also run tests with ``py.test``.
+
+You can install it with the following command:
+
+.. code:: shell
+
+    $ pip install pytest{,-django}
+    # Optionally
+    $ pip install pytest-sugar
+
+We've added a section in our ``setup.cfg``, so you should be able to run tests simply with:
+
+.. code:: shell
+
+    $ py.test
+
+
 Swagger documentation update
 ----------------------------
 

docs/source/dev.rst

@@ -10,3 +10,11 @@ multi_line_output = 5
 not_skip = __init__.py
 skip = migrations, settings
 line_length = 80
+
+[tool:pytest]
+
+addopts =
+    --ds=demo.settings
+
+testpaths =
+    demo/tests