Working, no functionality yet

diff --git a/Makefile.PL b/Makefile.PL
index 9fc7f67..1cd94dd 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -5,15 +5,11 @@ use inc::Module::Install 0.91;
 name 'Catalyst-TraitFor-Request-ProxyBase';
 all_from 'lib/Catalyst/TraitFor/Request/ProxyBase.pm';
 
-name 'CatalystX-RequestRole-ProxyBase';
-all_from 'lib/CatalystX/RequestRole/ProxyBase.pm';
-
 requires 'Moose';
 requires 'namespace::autoclean';
 
-build_requires 'Catalyst::Runtime' => 5.80;
+build_requires 'Catalyst::Runtime' => '5.80007';
 build_requires 'CatalystX::RoleApplicator' => '0.005';
-build_requires 'Test::WWW::Mechanize::Catalyst';
 build_requires 'Test::More';
 
 WriteAll();

diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
index b981c45..8989a7c 100644 (file)
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -1,9 +1,17 @@
 package TestApp;
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
+
+extends 'Catalyst';
 
 use Catalyst;
+use CatalystX::RoleApplicator;
+
+__PACKAGE__->apply_request_class_roles(qw/
+    Catalyst::TraitFor::Request::ProxyBase
+/);
 
 __PACKAGE__->setup;
 
 1;
+

diff --git a/t/lib/TestApp/Controller/Root.pm b/t/lib/TestApp/Controller/Root.pm
index 99b610d..14e2c43 100644 (file)
--- a/t/lib/TestApp/Controller/Root.pm
+++ b/t/lib/TestApp/Controller/Root.pm
@@ -1,12 +1,16 @@
 package TestApp::Controller::Root;
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
+
+BEGIN { extends 'Catalyst::Controller'; }
 
 __PACKAGE__->config(namespace => q{});
 
-use base 'Catalyst::Controller';
+sub default : Action {
+    my ($self, $c) = @_;
+    $c->res->body( $c->req->base );
+    $c->res->content_type('text/plain');
+}
 
-# your actions replace this one
-sub main :Path { $_[1]->res->body('<h1>It works</h1>') }
+__PACKAGE__->meta->make_immutable;
 
-1;

diff --git a/t/live-test.t b/t/live-test.t
index 88a3380..b1f664d 100644 (file)
--- a/t/live-test.t
+++ b/t/live-test.t
@@ -2,18 +2,17 @@
 
 use strict;
 use warnings;
-use Test::More tests => 3;
+use Test::More tests => 1;
 
 # setup library path
 use FindBin qw($Bin);
 use lib "$Bin/lib";
 
-# make sure testapp works
-use ok 'TestApp';
+use TestApp;
 
 # a live test against TestApp, the test application
-use Test::WWW::Mechanize::Catalyst 'TestApp';
-my $mech = Test::WWW::Mechanize::Catalyst->new;
-$mech->get_ok('http://localhost/', 'get main page');
-$mech->content_like(qr/it works/i, 'see if it has our text');
+use Catalyst::Test 'TestApp';
+
+my ($res, $c) = ctx_request('/');
+is($c->res->body, 'http://localhost/');