merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237

1 files changed, 4 insertions, 4 deletions

diff --git a/rt/t/lifecycles/basics.t b/rt/t/lifecycles/basics.t
index 554c95a73..e18bea3c4 100644
--- a/rt/t/lifecycles/basics.t
+++ b/rt/t/lifecycles/basics.t
@@ -1,7 +1,5 @@
-
 use strict;
 use warnings;
-use Data::Dumper;
 
 BEGIN {require  't/lifecycles/utils.pl'};
 
@@ -19,7 +17,7 @@ my $tstatus = sub {
 
 diag "check basic API";
 {
-    my $schema = $general->Lifecycle;
+    my $schema = $general->LifecycleObj;
     isa_ok($schema, 'RT::Lifecycle');
     is $schema->Name, 'default', "it's a default schema";
     is_deeply [$schema->Valid],
@@ -80,7 +78,7 @@ diag "check status input on create";
 
     my $valid = 1;
     foreach ( @form_values ) {
-        next if $general->Lifecycle->IsValid($_);
+        next if $general->LifecycleObj->IsValid($_);
         $valid = 0;
         diag("$_ doesn't appear to be a valid status, but it was in the form");
     }
@@ -244,3 +242,5 @@ diag "'!inactive -> inactive' actions are shown even if ticket has unresolved de
     );
 }
 
+undef $m;
+done_testing;