From 50988eaa64da93ea3aa7498989349aec371c7d2e Mon Sep 17 00:00:00 2001
From: daviddelikat <david-delikat@usa.net>
Date: Mon, 5 Oct 2009 10:14:33 -0500
Subject: [PATCH] more work on tests added submission deadline and admin
 override fields

---
 lib/WebGUI/Asset/EMSSubmission.pm     | 11 ++++----
 lib/WebGUI/Asset/EMSSubmissionForm.pm |  7 ++++++
 t/Asset/EMSSubmissionForm.t           | 36 ++++++++++++++++++++++-----
 3 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/lib/WebGUI/Asset/EMSSubmission.pm b/lib/WebGUI/Asset/EMSSubmission.pm
index 5d740fded..a8493866c 100644
--- a/lib/WebGUI/Asset/EMSSubmission.pm
+++ b/lib/WebGUI/Asset/EMSSubmission.pm
@@ -190,12 +190,11 @@ sub definition {
 		    label        => $i18n->get("send email label"),
 		    hoverHelp    => $i18n->get("send email label help")
 		},
-		commentTab => {
-		      noFormPost => 1,
-		      tab       => "comments",
-		      fieldType => "hidden",
-		      customDrawMethod => 'drawComments',
-		 }
+		adminOverride => {
+				noFormPost              => 1,
+				fieldType               => "hidden",
+				defaultValue    => '{}',
+		},
     );
     push @{$definition}, {
         assetName         => $i18n->get('assetName'),
diff --git a/lib/WebGUI/Asset/EMSSubmissionForm.pm b/lib/WebGUI/Asset/EMSSubmissionForm.pm
index cc5b508e9..c71abaf51 100644
--- a/lib/WebGUI/Asset/EMSSubmissionForm.pm
+++ b/lib/WebGUI/Asset/EMSSubmissionForm.pm
@@ -136,6 +136,13 @@ sub definition {
             label        => $i18n->get("delete created items label"),
             hoverHelp    => $i18n->get("delete created items label help")
         },
+        submissionDeadline => { 
+            tab          => "properties",
+            fieldType    => "Date",
+            defaultValue => undef,
+            label        => $i18n->get("submission deadline label"),
+            hoverHelp    => $i18n->get("submission deadline label help")
+        },
         formDescription => { 
             tab          => "properties",
             fieldType    => "text",
diff --git a/t/Asset/EMSSubmissionForm.t b/t/Asset/EMSSubmissionForm.t
index 252e061a2..c452f9a6a 100644
--- a/t/Asset/EMSSubmissionForm.t
+++ b/t/Asset/EMSSubmissionForm.t
@@ -138,15 +138,29 @@ ok( $frmA->validateSubmission({
    startDate => '1255150800',
 	}), 'a valid submission' );
 ok( !$frmA->validateSubmission({
-   TODO => 1
+   title => 'titlea',
+   description => 'the description',
+   startDate => '1205150800',
 	}), 'not a valid submission: invalid value' );
 ok( !$frmA->validateSubmission({
-   TODO => 1
+   title => 'titlea',
+   price => 300.0,
+   description => 'the description',
+   startDate => '1255150800',
 	}), 'not a valid submission: invalid field' );
 ok( !$frmA->validateSubmission({
-   TODO => 1
+   title => 'titlea',
+   duration => 3.0,
+   description => 'the description',
+   startDate => '1255150800',
 	}), 'not a valid submission: readonly field' );
-# TODO: test more field validations
+ok( $frmA->validateSubmission({
+   title => 'titlea',
+   duration => 3.0,
+   description => 'the description',
+   startDate => '1255150800',
+   adminOverride => q{ { 'duration' : 3.0 } },
+	}), 'valid submission: field value override by admin' );
 
 
 # TODO use meta field in this form
@@ -156,12 +170,22 @@ my $frmB = $ems->addChild({
     canSubmitGroup           => $submitGroupB->getId,
     formDescription          => q{ {
    'title' : { 'type' : 'text' },
-   'synopsis' : { 'type' : 'textarea' },
+   'description' : { 'type' : 'textarea' },
    'duration' : { 'default' : 0.5 },
    'startDate' : { 'default' : '1255150800' },
+   'metaField1' : { 'type' : 'Url' },
                      } },
 });
-# TODO: test meta field validation
+ok( $frmA->validateSubmission({
+   title => 'title',
+   description => 'description',
+   metaField1 => 'http://google.com/',
+	}), 'valid submission: test valid metafield value' );
+ok( !$frmA->validateSubmission({
+   title => 'title',
+   description => 'description',
+   metaField1 => 'joe@sams.org',
+	}), 'invalid submission: test invalid metafield value' );
 
 loginUserA;