[Rt-commit] rt branch, 4.0/apache2-fixes, updated. rt-4.0.0-297-g8fdc298

[Alex Vandiver]

The branch, 4.0/apache2-fixes has been updated
       via  8fdc29834964a0ecc6506cd47845b8060084a310 (commit)
      from  f12d514b1542e22b8a9a71d117730a1af6658315 (commit)

Summary of changes:
 t/web/logout.t |    2 +-
 t/web/squish.t |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 8fdc29834964a0ecc6506cd47845b8060084a310
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue May 17 13:51:35 2011 -0400

    Use RT->Config->Set to adjust mason root, so it gets written to file and Apache tests see it

diff --git a/t/web/logout.t b/t/web/logout.t
index dd44d02..889e5fc 100644
--- a/t/web/logout.t
+++ b/t/web/logout.t
@@ -20,7 +20,7 @@ diag $url if $ENV{TEST_VERBOSE};
 # Stop server and set MasonLocalComponentRoot
 RT::Test->stop_server;
 
-$RT::MasonLocalComponentRoot = RT::Test::get_abs_relocatable_dir('html');
+RT->Config->Set(MasonLocalComponentRoot => RT::Test::get_abs_relocatable_dir('html'));
 
 ($baseurl, $agent) = RT::Test->started_ok;
 
diff --git a/t/web/squish.t b/t/web/squish.t
index 60dec30..a6c775b 100644
--- a/t/web/squish.t
+++ b/t/web/squish.t
@@ -5,8 +5,7 @@ use RT::Test tests => 21;
 
 RT->Config->Set( DevelMode            => 0 );
 RT->Config->Set( WebDefaultStylesheet => 'aileron' );
-
-$RT::MasonLocalComponentRoot = RT::Test::get_abs_relocatable_dir('html');
+RT->Config->Set( MasonLocalComponentRoot => RT::Test::get_abs_relocatable_dir('html') );
 
 my ( $url, $m ) = RT::Test->started_ok;
 $m->login;

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