[Rt-commit] rt branch, 4.0/apache2-fixes, updated. rt-4.0.0-296-gf12d514

[Shawn Moore]

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

Summary of changes:
 t/web/path-traversal.t |   10 ++++++++--
 t/web/walk.t           |    4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit 8caa6def5466cd8534988346847dfdc431559316
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Thu May 12 11:08:17 2011 -0400

    Fix t/web/walk.t a la c3f6b266 because of b65f7690
    
        Because of b65f7690, we haven't autoloaded the Queue object yet, so
        we just get the id. The same change is buried in c3f6b266 amongst
        all the plan changes.

diff --git a/t/web/walk.t b/t/web/walk.t
index ff21fba..34fab14 100644
--- a/t/web/walk.t
+++ b/t/web/walk.t
@@ -39,13 +39,13 @@ ok( $class->id, 'created class_foo' );
 # to make search have results
 my $open_ticket = RT::Test->create_ticket(
     Subject => 'ticket_foo',
-    Queue   => 'General'
+    Queue   => 1,
 );
 
 my $resolved_ticket = RT::Test->create_ticket(
     Subject => 'ticket_bar',
     Status  => 'resolved',
-    Queue   => 'General'
+    Queue   => 1,
 );
 
 my @links = (

commit f12d514b1542e22b8a9a71d117730a1af6658315
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Thu May 12 12:43:05 2011 -0400

    Apache rejects busting up above / for us so skip the warning tests

diff --git a/t/web/path-traversal.t b/t/web/path-traversal.t
index 14202de..5d5c954 100644
--- a/t/web/path-traversal.t
+++ b/t/web/path-traversal.t
@@ -19,11 +19,17 @@ $agent->warning_like(qr/Invalid request.*aborting/,);
 
 $agent->get("$baseurl/NoAuth/../../../etc/RT_Config.pm");
 is($agent->status, 400);
-$agent->warning_like(qr/Invalid request.*aborting/,);
+SKIP: {
+    skip "Apache rejects busting up above / for us", 2 if $ENV{RT_TEST_WEB_HANDLER} =~ /^apache/;
+    $agent->warning_like(qr/Invalid request.*aborting/,);
+};
 
 $agent->get("$baseurl/NoAuth/css/web2/images/../../../../../../etc/RT_Config.pm");
 is($agent->status, 400);
-$agent->warning_like(qr/Invalid request.*aborting/,);
+SKIP: {
+    skip "Apache rejects busting up above / for us", 2 if $ENV{RT_TEST_WEB_HANDLER} =~ /^apache/;
+    $agent->warning_like(qr/Invalid request.*aborting/,);
+};
 
 # do not reject these URLs, even though they contain /. outside the path
 $agent->get("$baseurl/index.html?ignored=%2F%2E");

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