[Catalyst-commits] r13026 - Catalyst-Runtime/5.80/branches/psgi/t/aggregate

t0m at dev.catalyst.perl.org t0m at dev.catalyst.perl.org
Mon Mar 8 00:36:56 GMT 2010


Author: t0m
Date: 2010-03-08 00:36:55 +0000 (Mon, 08 Mar 2010)
New Revision: 13026

Added:
   Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine-prepare_path.t
Removed:
   Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine_cgi-prepare_path.t
Log:
Rename test to be more sensible

Copied: Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine-prepare_path.t (from rev 13025, Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine_cgi-prepare_path.t)
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine-prepare_path.t	                        (rev 0)
+++ Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine-prepare_path.t	2010-03-08 00:36:55 UTC (rev 13026)
@@ -0,0 +1,86 @@
+use strict;
+use warnings;
+use Test::More;
+use FindBin qw/$Bin/;
+use lib "$Bin/../lib";
+use TestApp;
+use Catalyst::Engine;
+
+# mod_rewrite to app root for non / based app
+{
+    my $r = get_req (
+        SCRIPT_NAME => '/comics/dispatch.cgi',
+        REQUEST_URI => '/comics/',
+    );
+    is ''.$r->uri, 'http://www.foo.com/comics/';
+    is ''.$r->base, 'http://www.foo.com/comics/';
+}
+
+# mod_rewrite to sub path under app root for non / based app
+{
+    my $r = get_req (
+        PATH_INFO  => '/foo/bar.gif',
+        SCRIPT_NAME => '/comics/dispatch.cgi',
+        REQUEST_URI => '/comics/foo/bar.gif',
+    );
+    is ''.$r->uri, 'http://www.foo.com/comics/foo/bar.gif';
+    is ''.$r->base, 'http://www.foo.com/comics/';
+}
+
+# Standard CGI hit for non / based app
+{
+    my $r = get_req (
+        PATH_INFO => '/static/css/blueprint/screen.css',
+        SCRIPT_NAME => '/~bobtfish/Gitalist/script/gitalist.cgi',
+        REQUEST_URI => '/~bobtfish/Gitalist/script/gitalist.cgi/static/css/blueprint/screen.css',
+    );
+    is ''.$r->uri, 'http://www.foo.com/~bobtfish/Gitalist/script/gitalist.cgi/static/css/blueprint/screen.css';
+    is ''.$r->base, 'http://www.foo.com/~bobtfish/Gitalist/script/gitalist.cgi/';
+}
+# / %2F %252F escaping case.
+{
+    my $r = get_req (
+        PATH_INFO => '/%2F/%2F',
+        SCRIPT_NAME => '/~bobtfish/Gitalist/script/gitalist.cgi',
+        REQUEST_URI => '/~bobtfish/Gitalist/script/gitalist.cgi/%252F/%252F',
+    );
+    is ''.$r->uri, 'http://www.foo.com/~bobtfish/Gitalist/script/gitalist.cgi/%252F/%252F';
+    is ''.$r->base, 'http://www.foo.com/~bobtfish/Gitalist/script/gitalist.cgi/';
+}
+
+# Using rewrite rules to ask for a sub-path in your app.
+# E.g. RewriteRule ^(.*)$ /path/to/fastcgi/domainprofi.fcgi/iframeredirect$1 [L,NS]
+{
+    my $r = get_req (
+        PATH_INFO => '/iframeredirect/info',
+        SCRIPT_NAME => '',
+        REQUEST_URI => '/info',
+    );
+    is ''.$r->uri, 'http://www.foo.com/iframeredirect/info';
+    is ''.$r->base, 'http://www.foo.com/';
+}
+
+
+
+# FIXME - Test proxy logic
+#       - Test query string
+#       - Test non standard port numbers
+#       - Test // in PATH_INFO
+#       - Test scheme (secure request on port 80)
+
+sub get_req {
+    my %template = (
+        HTTP_HOST => 'www.foo.com',
+        PATH_INFO => '/',
+    );
+
+    my $engine = Catalyst::Engine->new(
+        env => { %template, @_ },
+    );
+    my $i = TestApp->new;
+    $engine->prepare_path($i);
+    return $i->req;
+}
+
+done_testing;
+

Deleted: Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine_cgi-prepare_path.t
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine_cgi-prepare_path.t	2010-03-08 00:25:56 UTC (rev 13025)
+++ Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine_cgi-prepare_path.t	2010-03-08 00:36:55 UTC (rev 13026)
@@ -1,86 +0,0 @@
-use strict;
-use warnings;
-use Test::More;
-use FindBin qw/$Bin/;
-use lib "$Bin/../lib";
-use TestApp;
-use Catalyst::Engine;
-
-# mod_rewrite to app root for non / based app
-{
-    my $r = get_req (
-        SCRIPT_NAME => '/comics/dispatch.cgi',
-        REQUEST_URI => '/comics/',
-    );
-    is ''.$r->uri, 'http://www.foo.com/comics/';
-    is ''.$r->base, 'http://www.foo.com/comics/';
-}
-
-# mod_rewrite to sub path under app root for non / based app
-{
-    my $r = get_req (
-        PATH_INFO  => '/foo/bar.gif',
-        SCRIPT_NAME => '/comics/dispatch.cgi',
-        REQUEST_URI => '/comics/foo/bar.gif',
-    );
-    is ''.$r->uri, 'http://www.foo.com/comics/foo/bar.gif';
-    is ''.$r->base, 'http://www.foo.com/comics/';
-}
-
-# Standard CGI hit for non / based app
-{
-    my $r = get_req (
-        PATH_INFO => '/static/css/blueprint/screen.css',
-        SCRIPT_NAME => '/~bobtfish/Gitalist/script/gitalist.cgi',
-        REQUEST_URI => '/~bobtfish/Gitalist/script/gitalist.cgi/static/css/blueprint/screen.css',
-    );
-    is ''.$r->uri, 'http://www.foo.com/~bobtfish/Gitalist/script/gitalist.cgi/static/css/blueprint/screen.css';
-    is ''.$r->base, 'http://www.foo.com/~bobtfish/Gitalist/script/gitalist.cgi/';
-}
-# / %2F %252F escaping case.
-{
-    my $r = get_req (
-        PATH_INFO => '/%2F/%2F',
-        SCRIPT_NAME => '/~bobtfish/Gitalist/script/gitalist.cgi',
-        REQUEST_URI => '/~bobtfish/Gitalist/script/gitalist.cgi/%252F/%252F',
-    );
-    is ''.$r->uri, 'http://www.foo.com/~bobtfish/Gitalist/script/gitalist.cgi/%252F/%252F';
-    is ''.$r->base, 'http://www.foo.com/~bobtfish/Gitalist/script/gitalist.cgi/';
-}
-
-# Using rewrite rules to ask for a sub-path in your app.
-# E.g. RewriteRule ^(.*)$ /path/to/fastcgi/domainprofi.fcgi/iframeredirect$1 [L,NS]
-{
-    my $r = get_req (
-        PATH_INFO => '/iframeredirect/info',
-        SCRIPT_NAME => '',
-        REQUEST_URI => '/info',
-    );
-    is ''.$r->uri, 'http://www.foo.com/iframeredirect/info';
-    is ''.$r->base, 'http://www.foo.com/';
-}
-
-
-
-# FIXME - Test proxy logic
-#       - Test query string
-#       - Test non standard port numbers
-#       - Test // in PATH_INFO
-#       - Test scheme (secure request on port 80)
-
-sub get_req {
-    my %template = (
-        HTTP_HOST => 'www.foo.com',
-        PATH_INFO => '/',
-    );
-
-    my $engine = Catalyst::Engine->new(
-        env => { %template, @_ },
-    );
-    my $i = TestApp->new;
-    $engine->prepare_path($i);
-    return $i->req;
-}
-
-done_testing;
-




More information about the Catalyst-commits mailing list