Moved Survey test upgrade to 7.7.6-7.7.7 upgrade script

docs/changelog/7.x.x.txt

@@ -5,6 +5,7 @@
  - Improved VAT number management for admins ( Martin Kamerbeek / Oqapi )
  - rfe #9981: RedirectAfterLogin Setting
  - Added user create, update, and delete web services ( HD Publishing )
+ - Added Survey web test suite for validating expression/branching logic
 
 7.7.6
  - Added mobile style template.  If enabled in settings, will serve alternate style templates

docs/upgrades/upgrade_7.7.5-7.7.6.pl

@@ -42,7 +42,6 @@ sendWebguiStats($session);
 addDataFormColumns($session);
 addListingsCacheTimeoutToMatrix( $session );
 addSurveyFeedbackTemplateColumn( $session );
-addSurveyTestResultsTemplateColumn( $session );
 installCopySender($session);
 installNotificationsSettings($session);
 installSMSUserProfileFields($session);
@@ -108,6 +107,16 @@ sub addMobileStyleTemplate {
         'Profile/MIDP',
         'Smartphone',
         'Symbian ?OS',
+
+#----------------------------------------------------------------------------
+sub addSurveyTestResultsTemplateColumn {
+    my $session = shift;
+    print "\tAdding columns for Survey Test Results Template..." unless $quiet;
+    $session->db->write("alter table Survey add column `testResultsTemplateId` char(22)");
+
+    print "Done\n" unless $quiet;
+
+}
         'J2ME/MIDP',
         'PalmSource',
         'PalmOS',
@@ -228,16 +237,6 @@ sub addSurveyFeedbackTemplateColumn {
 
 }
 
-#----------------------------------------------------------------------------
-sub addSurveyTestResultsTemplateColumn {
-    my $session = shift;
-    print "\tAdding columns for Survey Test Results Template..." unless $quiet;
-    $session->db->write("alter table Survey add column `testResultsTemplateId` char(22)");
-
-    print "Done\n" unless $quiet;
-
-}
-
 #----------------------------------------------------------------------------
 # Your sub here
 sub installCopySender {

docs/upgrades/upgrade_7.7.6-7.7.7.pl

@@ -33,6 +33,7 @@ addOgoneToConfig( $session );
 addUseEmailAsUsernameToSettings( $session );
 alterVATNumberTable( $session );
 addRedirectAfterLoginUrlToSettings( $session );
+addSurveyTestResultsTemplateColumn( $session );
 
 finish($session); # this line required
 
@@ -78,6 +79,16 @@ sub alterVATNumberTable {
     print "Done\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
+sub addSurveyTestResultsTemplateColumn {
+    my $session = shift;
+    print "\tAdding columns for Survey Test Results Template..." unless $quiet;
+    $session->db->write("alter table Survey add column `testResultsTemplateId` char(22)");
+
+    print "Done\n" unless $quiet;
+
+}
+
 # -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
 
 #----------------------------------------------------------------------------

lib/WebGUI/Asset/Wobject/Survey.pm

@@ -2452,7 +2452,7 @@ sub www_editTestSuite {
     
     my $testsFound = 0;
     my $tests = '<table class="content"><tr><th></th><th>' . $i18n->get('test name') . '</th></tr><tbody class="tableData">';
-    my $getATest = WebGUI::Asset::Wobject::Survey::Test->getAllIterator($session);
+    my $getATest = WebGUI::Asset::Wobject::Survey::Test->getAllIterator($session, { sequenceKeyValue => $self->getId } );
     my $icon = $session->icon;
     while (my $test = $getATest->()) {
         $testsFound++;

lib/WebGUI/Asset/Wobject/Survey/Test.pm

@@ -50,7 +50,7 @@ Identifies the Survey instance.
 
 A name for the test
 
-=head4 spec
+=head4 test
 
 The test spec
 
@@ -74,7 +74,7 @@ sub crud_definition {
         hoverHelp    => $i18n->get( 'test name help', 'Asset_Survey' ),
         defaultValue => '',
     };
-    $properties->{spec} = {
+    $properties->{test} = {
         fieldType    => 'codearea',
         label        => $i18n->get( 'test spec', 'Asset_Survey' ),
         hoverHelp    => $i18n->get( 'test spec help', 'Asset_Survey' ),
@@ -104,7 +104,7 @@ sub run {
         return { tap => 'Bail Out! enableSurveyExpressionEngine config option disabled' };
     }
     
-    my $spec = $self->get('spec') 
+    my $spec = $self->get('test') 
         or return { tap => "Bail Out! Test spec undefined" };
     
     eval {

t/Asset/Wobject/Survey/Test.t

@@ -151,7 +151,7 @@ sub try_it {
     my ($test, $spec, $opts) = @_;
     chomp($spec);
     
-    $test->update( { spec => $spec } );
+    $test->update( { test => $spec } );
     my $result = $t1->run();
     ok( $result, 'Tests ran ok' );