Fix validation of form name and description when empty

- Added "not_empty" validation rule to name
- Always check validation for name
- Added migration allowing null for description
- Add a test for setting form.name to empty

application/classes/Ushahidi/Validator/Form/Create.php

@@ -18,8 +18,9 @@ class Ushahidi_Validator_Form_Create extends Ushahidi_Validator_Form_Update
 	protected function getRules()
 	{
 		return array_merge_recursive(parent::getRules(), [
-			'name' => [['not_empty'],
-			[[$this, 'checkPostTypeLimit'], [':validation']],
-		]]);
+			'name' => [
+				[[$this, 'checkPostTypeLimit'], [':validation']],
+			]
+		]);
 	}
 }

application/classes/Ushahidi/Validator/Form/Update.php

@@ -31,8 +31,18 @@ public function __construct(FormRepository $repo)
 
 	protected function getRules()
 	{
+		// Always check validation for name
+		$name = $this->validation_engine->getFullData('name');
+		if ($name) {
+			$data = $this->validation_engine->getData();
+			$data['name'] = $name;
+			$this->validation_engine->setData($data);
+		}
+		// End
+
 		return [
 			'name' => [
+				['not_empty'],
 				['min_length', [':value', 2]],
 				['regex', [':value', Validator::REGEX_STANDARD_TEXT]], // alpha, number, punctuation, space
 			],

migrations/20170630084848_allow_null_in_description_forms.php

@@ -0,0 +1,26 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+class AllowNullInDescriptionForms extends AbstractMigration
+{
+    /**
+     * Migrate Up.
+     */
+    public function up()
+    {
+        $this->table('forms')
+            ->changeColumn('description', 'text', ['null' => true])
+            ->save();
+    }
+
+    /**
+     * Migrate Down.
+     */
+    public function down()
+    {
+        $this->table('forms')
+            ->changeColumn('description', 'text', ['null' => false])
+            ->save();
+    }
+}

tests/integration/forms.feature

@@ -52,6 +52,24 @@ Feature: Testing the Forms API
         And the "everyone_can_create" property is false
         Then the guzzle status code should be 200
 
+    Scenario: Updating a Form to clear name should fail
+        Given that I want to update a "Form"
+        And that the request "data" is:
+            """
+            {
+                "name":"",
+                "type":"report",
+                "description":"This is a test form updated by BDD testing",
+                "disabled":true,
+                "require_approval":false,
+                "everyone_can_create":false
+            }
+            """
+        And that its "id" is "1"
+        When I request "/forms"
+        Then the response is JSON
+        Then the guzzle status code should be 422
+
     Scenario: Update a non-existent Form
         Given that I want to update a "Form"
         And that the request "data" is: