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

1 files changed, 6 insertions, 2 deletions

diff --git a/rt/t/web/helpers-http-cache-headers.t b/rt/t/web/helpers-http-cache-headers.t
index 1731e9d17..1020832ca 100644
--- a/rt/t/web/helpers-http-cache-headers.t
+++ b/rt/t/web/helpers-http-cache-headers.t
@@ -23,10 +23,14 @@ ok $m->login, 'logged in';
 my $docroot = join '/', qw(share html);
 
 # find endpoints to loop over
-my @endpoints = ('/NoAuth/css/print.css');
+my @endpoints = (
+    "/NoAuth/css/aileron/squished-".("0"x32).".css",
+    '/static/images/bpslogo.png',
+);
 find({
   wanted => sub {
     if ( -f $_ && $_ !~ m|autohandler$| ) {
+      return if m{/\.[^/]+\.sw[op]$}; # vim swap files
       ( my $endpoint = $_ ) =~ s|^$docroot||;
       push @endpoints, $endpoint;
     }
@@ -76,7 +80,7 @@ foreach my $endpoint ( @endpoints ) {
   my $header_key = 'default';
   if ( $endpoint =~ m|Autocomplete| ) {
     $header_key =  'Autocomplete';
-  } elsif ( $endpoint =~ m|NoAuth| ) {
+  } elsif ( $endpoint =~ m/NoAuth|static/ ) {
     $header_key =  'NoAuth';
   }
   my $headers = $expected->{$header_key};