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

1 files changed, 8 insertions, 8 deletions

diff --git a/rt/t/web/squish.t b/rt/t/web/squish.t
index ff43e74fb..9d1c01b1f 100644
--- a/rt/t/web/squish.t
+++ b/rt/t/web/squish.t
@@ -5,18 +5,18 @@ use RT::Test tests => 26;
 
 RT->Config->Set( DevelMode            => 0 );
 RT->Config->Set( WebDefaultStylesheet => 'aileron' );
-RT->Config->Set( MasonLocalComponentRoot => RT::Test::get_abs_relocatable_dir('html') );
+RT->Config->Set( LocalStaticPath => RT::Test::get_abs_relocatable_dir('static') );
 
 my ( $url, $m ) = RT::Test->started_ok;
 $m->login;
 
 diag "test squished files with devel mode disabled";
 
-$m->follow_link_ok( { url_regex => qr!aileron-squished-([a-f0-9]{32})\.css! },
+$m->follow_link_ok( { url_regex => qr!aileron/squished-([a-f0-9]{32})\.css! },
     'follow squished css' );
 $m->content_like( qr!/\*\* End of .*?.css \*/!, 'squished css' );
-$m->content_lacks( 'text-decoration: underline !important;',
-    'no print.css by default' );
+$m->content_lacks( 'counteract the titlebox',
+    'no mobile.css by default' );
 
 $m->back;
 my ($js_link) =
@@ -29,16 +29,16 @@ RT::Test->stop_server;
 
 diag "test squished files with customized files and devel mode disabled";
 RT->AddJavaScript( 'not-by-default.js' );
-RT->AddStyleSheets( 'print.css' );
+RT->AddStyleSheets( 'mobile.css' );
 
 ( $url, $m ) = RT::Test->started_ok;
 
 $m->login;
-$m->follow_link_ok( { url_regex => qr!aileron-squished-([a-f0-9]{32})\.css! },
+$m->follow_link_ok( { url_regex => qr!aileron/squished-([a-f0-9]{32})\.css! },
     'follow squished css' );
 $m->content_like( qr!/\*\* End of .*?.css \*/!, 'squished css' );
-$m->content_contains( 'text-decoration: underline !important;',
-    'has print.css' );
+$m->content_contains( 'counteract the titlebox',
+    'has mobile.css' );
 
 $m->back;
 ($js_link) =