Require a well-formed email address for all comments.

2 files changed, 32 insertions, 0 deletions

diff --git a/modules/comment/tests/Comment_Event_Test.php b/modules/comment/tests/Comment_Event_Test.php
index 62ffec2f..7cae9297 100644
--- a/modules/comment/tests/Comment_Event_Test.php
+++ b/modules/comment/tests/Comment_Event_Test.php
@@ -25,6 +25,7 @@ class Comment_Event_Test extends Gallery_Unit_Test_Case {
     $comment->item_id = $album->id;
     $comment->author_id = identity::guest()->id;
     $comment->guest_name = "test";
+    $comment->guest_email = "test@test.com";
     $comment->text = "text";
     $comment->save();
 
diff --git a/modules/comment/tests/Comment_Model_Test.php b/modules/comment/tests/Comment_Model_Test.php
index f4e944f0..ee4d3d3c 100644
--- a/modules/comment/tests/Comment_Model_Test.php
+++ b/modules/comment/tests/Comment_Model_Test.php
@@ -22,6 +22,37 @@ class Comment_Model_Test extends Gallery_Unit_Test_Case {
     identity::set_active_user(identity::admin_user());
   }
 
+  public function guest_name_and_email_is_required_test() {
+    try {
+      $comment = ORM::factory("comment");
+      $comment->item_id = item::root()->id;
+      $comment->author_id = identity::guest()->id;
+      $comment->text = "text";
+      $comment->save();
+    } catch (ORM_Validation_Exception $e) {
+      $this->assert_equal(array("guest_name" => "required",
+                                "guest_email" => "required"),
+                          $e->validation->errors());
+      return;
+    }
+  }
+
+  public function guest_email_must_be_well_formed_test() {
+    try {
+      $comment = ORM::factory("comment");
+      $comment->item_id = item::root()->id;
+      $comment->author_id = identity::guest()->id;
+      $comment->guest_name = "guest";
+      $comment->guest_email = "bogus";
+      $comment->text = "text";
+      $comment->save();
+    } catch (ORM_Validation_Exception $e) {
+      $this->assert_equal(array("guest_email" => "invalid"),
+                          $e->validation->errors());
+      return;
+    }
+  }
+
   public function cant_view_comments_for_unviewable_items_test() {
     $album = test::random_album();