Merge pull request #426 from peopledoc/fix-conditions-default-value

Fix conditions default value

Author: robincherbonnier

.circleci/config.yml

@@ -13,11 +13,13 @@ jobs:
           command: "apt-get update"
       - run:
           name: "Install postgresql-common Debian package"
-          command: "apt-get install -y postgresql-common"
+          command: "apt-get install -y postgresql postgresql-common"
       - checkout
       - run:
           name: Run the test suite
-          command: tox -r
+          command: |
+            chmod 777 /tmp
+            tox -r
 
   docs:
     working_directory: ~/django-formidable
@@ -29,11 +31,11 @@ jobs:
           name: Check Python version & install Python dependencies
           command: |
             python3 --version
-            sudo apt update && sudo apt install python-pip python-dev
+            sudo apt update && sudo apt install python3-pip python3-dev
       - run:
           name: Run Sphinx doc tests using tox
           command: |
-            pip install --user tox
+            python3 -m pip install --user tox
             ~/.local/bin/tox -e docs
 
 workflows:

CHANGELOG.rst

@@ -5,7 +5,9 @@ ChangeLog
 master (unreleased)
 ==================
 
-Nothing to see here.
+- Fix issues with postgresql on CI.
+- Replace deprecated yaml.load calls to fix doc build.
+- Add a default value `[]` to conditions.
 
 Release 7.1.0 (2021-06-28)
 ==========================

demo/tests/serializers/test_formidable_serializer.py

@@ -111,6 +111,22 @@ def test_custom_field_serialize_contextserializer(self):
         # remove instance
         instance.delete()
 
+    def test_custom_field_serialize_default_conditions(self):
+        serializer = FormidableSerializer(data=self.schema)
+        assert serializer.is_valid()
+
+        self.assertIn("conditions", serializer.validated_data)
+        self.assertEqual(serializer.validated_data["conditions"], [])
+
+    def test_custom_field_serialize_none_conditions(self):
+        self.schema["conditions"] = None
+        serializer = FormidableSerializer(data=self.schema)
+        assert not serializer.is_valid()
+
+        self.assertIn(
+            "This field may not be null.",
+            serializer.errors["conditions"])
+
     def test_context_in_field_serializer(self):
         # backup a serializer
         backup_serializer = self.field_register[self.custom_type_id]

docs/Makefile

@@ -241,4 +241,4 @@ collectstatic:
 	cp \
 		node_modules/swagger-ui-dist/* \
 		source/_static/swagger-ui/
-	python -c 'import yaml, json; json.dump(yaml.load(open("./swagger/formidable.yml")), open("./source/_static/specs/formidable.json", "w"), indent=4, separators=(",", ": "), sort_keys=True)'
+	python -c 'import yaml, json; json.dump(yaml.full_load(open("./swagger/formidable.yml")), open("./source/_static/specs/formidable.json", "w"), indent=4, separators=(",", ": "), sort_keys=True)'

docs/package-lock.json

@@ -1,75 +1,18 @@
 {
-  "_args": [
-    [
-      "[email protected]",
-      "/home/novapost/Projets/PeopleAsk/Dependencies/django-formidable/docs"
-    ]
-  ],
-  "_development": true,
-  "_from": "[email protected]",
-  "_id": "[email protected]",
-  "_inBundle": false,
-  "_integrity": "sha512-5uAjeEqV+zbtalBDXAIrkqUZwsUHYwvBSeGYlFcLj1ERS3jfprL4OPLSSriDoeXCtNmWzpz5aooV2qJW+DqdUQ==",
-  "_location": "/swagger-ui-dist",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "version",
-    "registry": true,
-    "raw": "[email protected]",
-    "name": "swagger-ui-dist",
-    "escapedName": "swagger-ui-dist",
-    "rawSpec": "3.24.0",
-    "saveSpec": null,
-    "fetchSpec": "3.24.0"
-  },
-  "_requiredBy": [
-    "#DEV:/"
-  ],
-  "_resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.24.0.tgz",
-  "_spec": "3.24.0",
-  "_where": "/home/novapost/Projets/PeopleAsk/Dependencies/django-formidable/docs",
-  "bugs": {
-    "url": "https://github.com/swagger-api/swagger-ui/issues"
-  },
+  "name": "swagger-ui-dist",
+  "version": "3.24.0",
+  "main": "index.js",
+  "repository": "[email protected]:swagger-api/swagger-ui.git",
   "contributors": [
-    {
-      "url": "in alphabetical order"
-    },
-    {
-      "name": "Anna Bodnia",
-      "email": "[email protected]"
-    },
-    {
-      "name": "Buu Nguyen",
-      "email": "[email protected]"
-    },
-    {
-      "name": "Josh Ponelat",
-      "email": "[email protected]"
-    },
-    {
-      "name": "Kyle Shockey",
-      "email": "[email protected]"
-    },
-    {
-      "name": "Robert Barnwell",
-      "email": "[email protected]"
-    },
-    {
-      "name": "Sahar Jafari",
-      "email": "[email protected]"
-    }
+    "(in alphabetical order)",
+    "Anna Bodnia <[email protected]>",
+    "Buu Nguyen <[email protected]>",
+    "Josh Ponelat <[email protected]>",
+    "Kyle Shockey <[email protected]>",
+    "Robert Barnwell <[email protected]>",
+    "Sahar Jafari <[email protected]>"
   ],
-  "dependencies": {},
-  "description": "[![NPM version](https://badge.fury.io/js/swagger-ui-dist.svg)](http://badge.fury.io/js/swagger-ui-dist)",
-  "devDependencies": {},
-  "homepage": "https://github.com/swagger-api/swagger-ui#readme",
   "license": "Apache-2.0",
-  "main": "index.js",
-  "name": "swagger-ui-dist",
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://[email protected]/swagger-api/swagger-ui.git"
-  },
-  "version": "3.24.0"
+  "dependencies": {},
+  "devDependencies": {}
 }

docs/source/_static/swagger-ui/package.json

@@ -28,7 +28,7 @@ def dict_constructor(loader, node):
     # Building raw data out of the Swagger Formidable definition
     swagger_file = join(ROOT_PATH, '..', 'swagger', 'formidable.yml')
     with open(swagger_file) as fd:
-        data = yaml.load(fd)
+        data = yaml.full_load(fd)
 
     to_exclude = (
         'BuilderForm', 'InputError', 'BuilderError', 'InputForm', 'InputField'

docs/tests/__init__.py

@@ -48,7 +48,7 @@ class ConditionSerializer(serializers.Serializer):
 class FormidableSerializer(WithNestedSerializer):
 
     fields = fields.FieldSerializer(many=True)
-    conditions = ConditionSerializer(many=True, required=False)
+    conditions = ConditionSerializer(many=True, required=False, default=[])
 
     nested_objects = ['fields']