Remove dispatch_path from test suite

PerlDancer · Mar 9, 2017 · eb9cff1 · eb9cff1
1 parent 2e11a84
commit eb9cff1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 19 deletions.
diff --git a/t/dsl/halt.t b/t/dsl/halt.t
@@ -61,7 +61,7 @@ subtest 'halt in before hook' => sub {
 
         hook before => sub {
             response->content('I was halted');
-            halt if request->dispatch_path eq '/shortcircuit';
+            halt if request->path eq '/shortcircuit';
         };
 
     }

diff --git a/t/dsl/halt_with_param.t b/t/dsl/halt_with_param.t
@@ -59,7 +59,7 @@ subtest 'halt with parameter in before hook' => sub {
         use Dancer2;
 
         hook before => sub {
-            halt('I was halted') if request->dispatch_path eq '/shortcircuit';
+            halt('I was halted') if request->path eq '/shortcircuit';
         };
 
     }

diff --git a/t/forward_before_hook.t b/t/forward_before_hook.t
@@ -18,14 +18,14 @@ get '/redirect' => sub {
 };
 
 hook before => sub {
-    return if request->dispatch_path eq '/default';
+    return if request->path eq '/default';
 
     # Add some content to the response
     response->content("SillyStringIsSilly");
 
     # redirect - response should include the above content
     return redirect '/default'
-        if request->dispatch_path eq '/redirect';
+        if request->path eq '/redirect';
 
     # The response object will get replaced by the result of the forward.
     forward '/default';

diff --git a/t/issues/gh-944.t b/t/issues/gh-944.t
@@ -11,7 +11,7 @@ use HTTP::Request::Common;
     set serializer => 'JSON';
 
     hook before => sub {
-        return if request->dispatch_path eq '/content';
+        return if request->path eq '/content';
         response->content({ foo => 'bar' });
         response->halt;
     };

diff --git a/t/request.t b/t/request.t
@@ -122,8 +122,8 @@ sub run_test {
         is $req->scheme, 'http';
     }
 
-    note "testing path, dispatch_path and uri_base"; {
-        # Base env used for path, dispatch_path and uri_base tests
+    note "testing path and uri_base"; {
+        # Base env used for path and uri_base tests
         my $base = {
             'psgi.url_scheme' => 'http',
             REQUEST_METHOD    => 'GET',
@@ -145,9 +145,6 @@ sub run_test {
         is( $req->uri_base, 'http://localhost:5000/foo',
             'uri_base correct when empty PATH_INFO'
         );
-        is( $req->dispatch_path, '/',
-            'dispatch_path correct when empty PATH_INFO'
-        );
 
         # SCRIPT_NAME not set
         $env = {
@@ -161,9 +158,6 @@ sub run_test {
         is( $req->uri_base, 'http://localhost:5000',
             'uri_base handles empty SCRIPT_NAME'
         );
-        is( $req->dispatch_path, '/foo',
-            'dispatch_path handles empty SCRIPT_NAME'
-        );
 
         # Both SCRIPT_NAME and PATH_INFO set
         # PSGI spec does not allow SCRIPT_NAME='/', PATH_INFO='/some/path'
@@ -180,9 +174,6 @@ sub run_test {
         is( $req->uri_base, 'http://localhost:5000/foo',
             'uri_base correct when both PATH_INFO and SCRIPT_NAME set',
         );
-        is( $req->dispatch_path, '/bar/baz/',
-            'dispatch_path correct when both PATH_INFO and SCRIPT_NAME set'
-        );
 
         # Neither SCRIPT_NAME or PATH_INFO set
         $env = {
@@ -198,9 +189,6 @@ sub run_test {
         is( $req->uri_base, 'http://localhost:5000',
             'uri_base correct when calculated from REQUEST_URI',
         );
-        is( $req->dispatch_path, '/',
-            'dispatch_path correct when calculated from REQUEST_URI'
-        );
     }
 
     note "testing forward";