[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-609-g26d6b82

Shawn Moore sartak at bestpractical.com
Fri Aug 27 00:35:55 EDT 2010


The branch, 3.9-trunk has been updated
       via  26d6b82da92a2817e874ff112b76ca787baf60de (commit)
       via  73fd960bb0587128da3bda6c75eb6f25a0c5a28a (commit)
      from  50c3c147d6f31ae66e7637fae4cb50342cdbe39f (commit)

Summary of changes:
 share/html/Elements/ScrubHTML     |    1 +
 t/00-compile.t                    |    1 -
 t/api/ace.t                       |    1 -
 t/api/action-createtickets.t      |    1 -
 t/api/attachment.t                |    1 -
 t/api/attribute-tests.t           |    3 ---
 t/api/attribute.t                 |    1 -
 t/api/cf_combo_cascade.t          |    1 -
 t/api/cf_single_values.t          |    1 -
 t/api/condition-ownerchange.t     |    1 -
 t/api/condition-reject.t          |    1 -
 t/api/currentuser.t               |    1 -
 t/api/customfield.t               |    1 -
 t/api/emailparser.t               |    1 -
 t/api/group.t                     |    1 -
 t/api/groups.t                    |    1 -
 t/api/i18n.t                      |    1 -
 t/api/link.t                      |    1 -
 t/api/queue.t                     |    1 -
 t/api/record.t                    |    1 -
 t/api/reminders.t                 |    2 +-
 t/api/rt.t                        |    1 -
 t/api/scrip.t                     |    1 -
 t/api/scrip_order.t               |    1 -
 t/api/searchbuilder.t             |    1 -
 t/api/system.t                    |    1 -
 t/api/template.t                  |    1 -
 t/api/ticket.t                    |    1 -
 t/api/tickets.t                   |    1 -
 t/api/tickets_overlay_sql.t       |    1 -
 t/api/uri-fsck_com_rt.t           |    1 -
 t/api/uri-t.t                     |    1 -
 t/api/user.t                      |    1 -
 t/api/users.t                     |    1 -
 t/cron.t                          |    1 -
 t/mail/gateway.t                  |    3 ---
 t/mail/sendmail.t                 |    1 -
 t/ticket/action_linear_escalate.t |    3 ---
 t/ticket/batch-upload-csv.t       |    1 -
 t/ticket/link_search.t            |    2 --
 t/web/basic.t                     |    2 --
 t/web/command_line.t              |    3 ---
 t/web/compilation_errors.t        |    1 -
 t/web/query_builder.t             |    1 -
 t/web/rights1.t                   |    1 -
 45 files changed, 2 insertions(+), 54 deletions(-)

- Log -----------------------------------------------------------------
commit 73fd960bb0587128da3bda6c75eb6f25a0c5a28a
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Fri Aug 27 00:09:57 2010 -0400

    Avoid undef warnings when scrubbing

diff --git a/share/html/Elements/ScrubHTML b/share/html/Elements/ScrubHTML
index d475bc6..eabbfd5 100644
--- a/share/html/Elements/ScrubHTML
+++ b/share/html/Elements/ScrubHTML
@@ -70,6 +70,7 @@ $scrubber->allow(
 $scrubber->comment(0);
 </%ONCE>
 <%init>
+$Content = '' if !defined($Content);
 return $scrubber->scrub($Content);
 </%init>
 <%args>

commit 26d6b82da92a2817e874ff112b76ca787baf60de
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Fri Aug 27 00:24:13 2010 -0400

    Remove a bunch of useless "1;"s at the ends of test files

diff --git a/t/00-compile.t b/t/00-compile.t
index 1a89e77..1baf74c 100644
--- a/t/00-compile.t
+++ b/t/00-compile.t
@@ -52,4 +52,3 @@ for (@files) {
     require_ok($_);
 }
 
-1;
diff --git a/t/api/ace.t b/t/api/ace.t
index 4031046..cb3e342 100644
--- a/t/api/ace.t
+++ b/t/api/ace.t
@@ -235,4 +235,3 @@ ok(  !$user_b->HasRight(Right => 'OwnTicket', Object => $q)   ,"user b does not
 
 }
 
-1;
diff --git a/t/api/action-createtickets.t b/t/api/action-createtickets.t
index 69ceb8d..a723a70 100644
--- a/t/api/action-createtickets.t
+++ b/t/api/action-createtickets.t
@@ -237,4 +237,3 @@ foreach my $id ( sort keys %expected ) {
 
 }
 
-1;
diff --git a/t/api/attachment.t b/t/api/attachment.t
index 07c46ba..f6732e9 100644
--- a/t/api/attachment.t
+++ b/t/api/attachment.t
@@ -42,4 +42,3 @@ is ($#headers, 2, "testing a bunch of singline multiple headers" );
 
 }
 
-1;
diff --git a/t/api/attribute-tests.t b/t/api/attribute-tests.t
index 90c3ddb..747d1eb 100644
--- a/t/api/attribute-tests.t
+++ b/t/api/attribute-tests.t
@@ -81,6 +81,3 @@ ok(1, $attr->BuildSelectQuery);
 @names = $attr->Names;
 is("@names", "TestAttr");
 
-
-
-1;
diff --git a/t/api/attribute.t b/t/api/attribute.t
index cb2626a..bbd96da 100644
--- a/t/api/attribute.t
+++ b/t/api/attribute.t
@@ -39,4 +39,3 @@ is ($id, 0);
 
 }
 
-1;
diff --git a/t/api/cf_combo_cascade.t b/t/api/cf_combo_cascade.t
index b37345a..52fa54a 100644
--- a/t/api/cf_combo_cascade.t
+++ b/t/api/cf_combo_cascade.t
@@ -43,4 +43,3 @@ is($cfv->Category, '1. Category A');
 works($cfv->SetCategory('1. Category AAA'));
 is($cfv->Category, '1. Category AAA');
 
-1;
diff --git a/t/api/cf_single_values.t b/t/api/cf_single_values.t
index 8e96edd..24e8ef4 100644
--- a/t/api/cf_single_values.t
+++ b/t/api/cf_single_values.t
@@ -35,4 +35,3 @@ is($t->CustomFieldValues($cf->id)->Count, 1, "One now");
 $t->AddCustomFieldValue(Field => $cf->id, Value => 'Second');
 is($t->CustomFieldValues($cf->id)->Count, 1, "Still one");
 
-1;
diff --git a/t/api/condition-ownerchange.t b/t/api/condition-ownerchange.t
index 4c4c49b..afa801a 100644
--- a/t/api/condition-ownerchange.t
+++ b/t/api/condition-ownerchange.t
@@ -48,4 +48,3 @@ is ($ticket->Priority , '24', "Ticket priority is set right");
 
 }
 
-1;
diff --git a/t/api/condition-reject.t b/t/api/condition-reject.t
index 9678950..e5ce719 100644
--- a/t/api/condition-reject.t
+++ b/t/api/condition-reject.t
@@ -42,4 +42,3 @@ is ($ticket->Priority , '21', "Condition is false, scrip skipped");
 
 }
 
-1;
diff --git a/t/api/currentuser.t b/t/api/currentuser.t
index c158048..cd3e776 100644
--- a/t/api/currentuser.t
+++ b/t/api/currentuser.t
@@ -29,4 +29,3 @@ SKIP: {
 
 }
 
-1;
diff --git a/t/api/customfield.t b/t/api/customfield.t
index 44319c4..41d35ef 100644
--- a/t/api/customfield.t
+++ b/t/api/customfield.t
@@ -71,4 +71,3 @@ ok(!$cf->ValidateType('SelectFooMultiple'));
 
 }
 
-1;
diff --git a/t/api/emailparser.t b/t/api/emailparser.t
index 940c26f..00c2a82 100644
--- a/t/api/emailparser.t
+++ b/t/api/emailparser.t
@@ -16,4 +16,3 @@ my @before = ("rt\@example.com", "frt\@example.com");
 my @after = ("frt\@example.com");
 ok(eq_array(RT::EmailParser::CullRTAddresses("", at before), at after), "CullRTAddresses only culls RT addresses");
 
-1;
diff --git a/t/api/group.t b/t/api/group.t
index 551d4f1..1e4fb38 100644
--- a/t/api/group.t
+++ b/t/api/group.t
@@ -96,4 +96,3 @@ is($u->PrincipalObj->PrincipalType , 'Group' , "Principal 4 is a group");
 
 }
 
-1;
diff --git a/t/api/groups.t b/t/api/groups.t
index 9a482f5..e0c398a 100644
--- a/t/api/groups.t
+++ b/t/api/groups.t
@@ -130,4 +130,3 @@ is($groups->Count, 1, "RTxGroupRight found for RTxObj2");
 
 }
 
-1;
diff --git a/t/api/i18n.t b/t/api/i18n.t
index 17d71b7..dcfe050 100644
--- a/t/api/i18n.t
+++ b/t/api/i18n.t
@@ -27,4 +27,3 @@ is($en->encoding , 'utf-8', "The encoding ".$en->encoding." is 'utf-8'");
 
 }
 
-1;
diff --git a/t/api/link.t b/t/api/link.t
index 0903525..47a839f 100644
--- a/t/api/link.t
+++ b/t/api/link.t
@@ -218,4 +218,3 @@ sub clean_links {
     }
 }
 
-1;
diff --git a/t/api/queue.t b/t/api/queue.t
index 44d5caf..97e06b2 100644
--- a/t/api/queue.t
+++ b/t/api/queue.t
@@ -89,4 +89,3 @@ ok ($group->Id, "Found the AdminCc object for this Queue");
 
 }
 
-1;
diff --git a/t/api/record.t b/t/api/record.t
index 6bf1af8..ec7fc85 100644
--- a/t/api/record.t
+++ b/t/api/record.t
@@ -67,4 +67,3 @@ ok($rid, $rmsg);
 
 }
 
-1;
diff --git a/t/api/reminders.t b/t/api/reminders.t
index fd1c6a6..f3d74ef 100644
--- a/t/api/reminders.t
+++ b/t/api/reminders.t
@@ -85,4 +85,4 @@ while ( my $reminder = $reminders->Next ) {
 is($r_resolved, 1, 'Reminder resolved');
 
 }
-1;
+
diff --git a/t/api/rt.t b/t/api/rt.t
index 3c06b58..8c8762c 100644
--- a/t/api/rt.t
+++ b/t/api/rt.t
@@ -15,4 +15,3 @@ isnt ($RT::SystemUser->Name() , 'noname', "The system user isn't noname");
 
 }
 
-1;
diff --git a/t/api/scrip.t b/t/api/scrip.t
index 8e8f962..97e5713 100644
--- a/t/api/scrip.t
+++ b/t/api/scrip.t
@@ -46,4 +46,3 @@ isnt ($ticket2->Priority , '87', "Ticket priority is set right");
 
 }
 
-1;
diff --git a/t/api/scrip_order.t b/t/api/scrip_order.t
index 9738db9..d351741 100644
--- a/t/api/scrip_order.t
+++ b/t/api/scrip_order.t
@@ -53,4 +53,3 @@ is  ($ticket->Priority , 10, "Ticket should be priority 10");
 
 # }}}
 
-1;
diff --git a/t/api/searchbuilder.t b/t/api/searchbuilder.t
index cb11890..f84c601 100644
--- a/t/api/searchbuilder.t
+++ b/t/api/searchbuilder.t
@@ -37,4 +37,3 @@ is_deeply(\@items_ids, \@sorted_ids, "ItemsArrayRef sorts alphabetically by name
 
 }
 
-1;
diff --git a/t/api/system.t b/t/api/system.t
index 3077115..318705a 100644
--- a/t/api/system.t
+++ b/t/api/system.t
@@ -30,4 +30,3 @@ is ($sys->id, 1);
 
 }
 
-1;
diff --git a/t/api/template.t b/t/api/template.t
index 1612b8f..2e39761 100644
--- a/t/api/template.t
+++ b/t/api/template.t
@@ -23,4 +23,3 @@ ok($t2->QueueObj->id, "Got the template's queue objet");
 
 }
 
-1;
diff --git a/t/api/ticket.t b/t/api/ticket.t
index 2ca0997..94d3ef3 100644
--- a/t/api/ticket.t
+++ b/t/api/ticket.t
@@ -254,4 +254,3 @@ ok(!$id,$msg);
 
 }
 
-1;
diff --git a/t/api/tickets.t b/t/api/tickets.t
index 9148a88..a336519 100644
--- a/t/api/tickets.t
+++ b/t/api/tickets.t
@@ -101,4 +101,3 @@ ok( $unlimittickets->Count > 0, "UnLimited tickets object should return tickets"
 
 }
 
-1;
diff --git a/t/api/tickets_overlay_sql.t b/t/api/tickets_overlay_sql.t
index 7980886..2e78340 100644
--- a/t/api/tickets_overlay_sql.t
+++ b/t/api/tickets_overlay_sql.t
@@ -70,4 +70,3 @@ my $string = 'subject/content SQL test';
 
 }
 
-1;
diff --git a/t/api/uri-fsck_com_rt.t b/t/api/uri-fsck_com_rt.t
index d62e580..522bf3f 100644
--- a/t/api/uri-fsck_com_rt.t
+++ b/t/api/uri-fsck_com_rt.t
@@ -25,4 +25,3 @@ $ticket->Load(1);
 $uri = RT::URI::fsck_com_rt->new($ticket->CurrentUser);
 is($uri->LocalURIPrefix. "/ticket/1" , $uri->URIForObject($ticket));
 
-1;
diff --git a/t/api/uri-t.t b/t/api/uri-t.t
index 4695629..32f87c6 100644
--- a/t/api/uri-t.t
+++ b/t/api/uri-t.t
@@ -18,4 +18,3 @@ is($uri->Object->Id, 1, "Object loaded has correct ID");
 is($uri->URI, 'fsck.com-rt://'.RT->Config->Get('Organization').'/ticket/1',
    "URI object has correct URI string");
 
-1;
diff --git a/t/api/user.t b/t/api/user.t
index 25cf747..129b2bf 100644
--- a/t/api/user.t
+++ b/t/api/user.t
@@ -336,4 +336,3 @@ ok($rqv, "Revoked the right successfully - $rqm");
 
 }
 
-1;
diff --git a/t/api/users.t b/t/api/users.t
index ce96e54..2149a5e 100644
--- a/t/api/users.t
+++ b/t/api/users.t
@@ -71,4 +71,3 @@ is($users->Count, 1, "RTxUserRight found for RTxObj2");
 
 }
 
-1;
diff --git a/t/cron.t b/t/cron.t
index 29d7bd7..b8fa0df 100644
--- a/t/cron.t
+++ b/t/cron.t
@@ -87,4 +87,3 @@ my ($trans, $desc, $transaction) = $ticket2->Comment(MIMEObj => $template_obj->M
 my $bogus_action = RT::Action::RecordComment->new(TicketObj => $ticket1, TemplateObj => $template_obj, TransactionObj => $transaction, CurrentUser => $CurrentUser);
 ok(!$bogus_action->Prepare(), "Comment aborted to prevent loop");
 
-1;
diff --git a/t/mail/gateway.t b/t/mail/gateway.t
index 6ff1911..bf22147 100644
--- a/t/mail/gateway.t
+++ b/t/mail/gateway.t
@@ -797,6 +797,3 @@ is( $tick->Transactions->Count, 5, "transactions added" );
 # }}}
 };
 
-
-1;
-
diff --git a/t/mail/sendmail.t b/t/mail/sendmail.t
index 539cf9e..06925ef 100644
--- a/t/mail/sendmail.t
+++ b/t/mail/sendmail.t
@@ -535,4 +535,3 @@ diag q{regression test for #5248 from rt3.fsck.com};
 
 # Don't taint the environment
 $everyone->PrincipalObj->RevokeRight(Right =>'SuperUser');
-1;
diff --git a/t/ticket/action_linear_escalate.t b/t/ticket/action_linear_escalate.t
index 38cd47d..2c042fb 100644
--- a/t/ticket/action_linear_escalate.t
+++ b/t/ticket/action_linear_escalate.t
@@ -60,9 +60,6 @@ escalate_ticket_ok($ticket3);
 ok( $ticket3->LastUpdatedBy == $user->id, "Did not set LastUpdated" );
 ok( $ticket3->Transactions->Last->Type =~ /Create/i, "Did not record a transaction" );
 
-1;
-
-
 sub create_ticket_as_ok {
     my $user = shift;
 
diff --git a/t/ticket/batch-upload-csv.t b/t/ticket/batch-upload-csv.t
index 41dc786..eb2cf1d 100644
--- a/t/ticket/batch-upload-csv.t
+++ b/t/ticket/batch-upload-csv.t
@@ -45,4 +45,3 @@ is($first->FirstCustomFieldValue($cf->id), '2.0');
 my $second = $tix->Next;
 is($second->Subject(), 'hello'); 
 is($second->FirstCustomFieldValue($cf->id), '3.0');
-1;
diff --git a/t/ticket/link_search.t b/t/ticket/link_search.t
index 687c01b..3c4752e 100644
--- a/t/ticket/link_search.t
+++ b/t/ticket/link_search.t
@@ -242,5 +242,3 @@ ok( $has{$parentid}, "The collection has our parent");
 ok( $has{$grand_childid}, "The collection have our child");
 ok( !$has{$unlinked_id}, "unlinked is not in collection");
 
-
-1;
diff --git a/t/web/basic.t b/t/web/basic.t
index 338bed9..d170c84 100644
--- a/t/web/basic.t
+++ b/t/web/basic.t
@@ -134,5 +134,3 @@ $query =~ s/\s+/ /g;
 
 is ($query, "Subject LIKE 'aaa' AND Subject LIKE 'bbb'");
 
-
-1;
diff --git a/t/web/command_line.t b/t/web/command_line.t
index 8904519..d32677a 100644
--- a/t/web/command_line.t
+++ b/t/web/command_line.t
@@ -540,6 +540,3 @@ sub check_attachment {
     }
 }
 
-
-
-1;
diff --git a/t/web/compilation_errors.t b/t/web/compilation_errors.t
index 7d4c2b3..6bc0358 100644
--- a/t/web/compilation_errors.t
+++ b/t/web/compilation_errors.t
@@ -61,4 +61,3 @@ sub test_get {
         };
 }
 
-1;
diff --git a/t/web/query_builder.t b/t/web/query_builder.t
index 153cb81..bb38a8b 100644
--- a/t/web/query_builder.t
+++ b/t/web/query_builder.t
@@ -244,4 +244,3 @@ diag "input a condition, select (several conditions), click delete";
     );
 }
 
-1;
diff --git a/t/web/rights1.t b/t/web/rights1.t
index c8892f2..0b00c27 100644
--- a/t/web/rights1.t
+++ b/t/web/rights1.t
@@ -107,4 +107,3 @@ ok($agent->form_name('BuildQuery'), "Yep, form is still there");
 my $input = $agent->current_form->find_input('ValueOfActor');
 ok(grep(/customer-$$/, $input->value_names()), "Found self in the actor listing");
 
-1;

-----------------------------------------------------------------------


More information about the Rt-commit mailing list