[Rt-commit] r19931 - in rt/3.999/trunk: lib t/web

[sartak at bestpractical.com]

Author: sartak
Date: Sat Jun  6 06:22:30 2009
New Revision: 19931

Modified:
   rt/3.999/trunk/lib/RT.pm
   rt/3.999/trunk/t/mail/gateway.t
   rt/3.999/trunk/t/web/attachments.t
   rt/3.999/trunk/t/web/cf_access.t
   rt/3.999/trunk/t/web/command_line.t

Log:
Get rid of $RT::MasonComponentRoot

Modified: rt/3.999/trunk/lib/RT.pm
==============================================================================
--- rt/3.999/trunk/lib/RT.pm	(original)
+++ rt/3.999/trunk/lib/RT.pm	Sat Jun  6 06:22:30 2009
@@ -72,10 +72,6 @@
 our $LocalLexiconPath = $BASE_PATH . '/local/po';
 our $LocalPluginPath  = $LocalPath . "/plugins";
 
-# $MasonComponentRoot is where your rt instance keeps its mason html files
-
-our $MasonComponentRoot = $BASE_PATH . '/share/html';
-
 # $MasonLocalComponentRoot is where your rt instance keeps its site-local
 # mason html files.
 

Modified: rt/3.999/trunk/t/mail/gateway.t
==============================================================================
--- rt/3.999/trunk/t/mail/gateway.t	(original)
+++ rt/3.999/trunk/t/mail/gateway.t	Sat Jun  6 06:22:30 2009
@@ -457,7 +457,7 @@
 diag "Testing preservation of binary attachments" if $ENV{'TEST_VERBOSE'};
 {
     # Get a binary blob (Best Practical logo) 
-    my $LOGO_FILE = $RT::MasonComponentRoot .'/NoAuth/images/bplogo.gif';
+    my $LOGO_FILE = Jifty::Util->app_root .'/share/html/NoAuth/images/bplogo.gif';
 
     # Create a mime entity with an attachment
     my $entity = MIME::Entity->build(

Modified: rt/3.999/trunk/t/web/attachments.t
==============================================================================
--- rt/3.999/trunk/t/web/attachments.t	(original)
+++ rt/3.999/trunk/t/web/attachments.t	Sat Jun  6 06:22:30 2009
@@ -3,9 +3,9 @@
 
 use RT::Test; use Test::More tests => 14;
 
-
-use constant LogoFile => $RT::MasonComponentRoot .'/NoAuth/images/bplogo.gif';
-use constant FaviconFile => $RT::MasonComponentRoot .'/NoAuth/images/favicon.png';
+use constant ImageRoot => Jifty::Util->app_root . '/share/html/NoAuth/images';
+use constant LogoFile => ImageRoot .'/bplogo.gif';
+use constant FaviconFile => ImageRoot .'/favicon.png';
 
 my ($baseurl, $m) = RT::Test->started_ok;
 ok $m->login, 'logged in';

Modified: rt/3.999/trunk/t/web/cf_access.t
==============================================================================
--- rt/3.999/trunk/t/web/cf_access.t	(original)
+++ rt/3.999/trunk/t/web/cf_access.t	Sat Jun  6 06:22:30 2009
@@ -7,7 +7,7 @@
 
 my ($baseurl, $m) = RT::Test->started_ok;
 
-use constant ImageFile => $RT::MasonComponentRoot .'/NoAuth/images/bplogo.gif';
+use constant ImageFile => Jifty::Util->app_root .'/share/html/NoAuth/images/bplogo.gif';
 use constant ImageFileContent => RT::Test->file_content(ImageFile);
 
 ok $m->login, 'logged in';

Modified: rt/3.999/trunk/t/web/command_line.t
==============================================================================
--- rt/3.999/trunk/t/web/command_line.t	(original)
+++ rt/3.999/trunk/t/web/command_line.t	Sat Jun  6 06:22:30 2009
@@ -116,7 +116,7 @@
     # text attachment
     check_attachment($test_email);
     # binary attachment
-    check_attachment($RT::MasonComponentRoot.'/NoAuth/images/bplogo.gif');
+    check_attachment(Jifty::Util->app_root.'/share/html/NoAuth/images/bplogo.gif');
 
 # change a ticket's Owner
 expect_send("edit ticket/$ticket_id set owner=root", 'Changing owner...');