From: Florian Ragwitz <rafl@debian.org>
Date: Mon, 29 Mar 2010 00:25:46 +0000 (+0000)
Subject: Move testapp actions to a root controller.
X-Git-Tag: v0.1100~7
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Authentication-Store-DBIx-Class.git;a=commitdiff_plain;h=5da987e8ca677745145716a386018b7090b2d500

Move testapp actions to a root controller.
---

diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
index 49ee981..619b4dd 100644
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -8,186 +8,4 @@ TestApp->config( $ENV{TESTAPP_CONFIG} );
 
 TestApp->setup( @{$ENV{TESTAPP_PLUGINS}} );
 
-sub user_login : Global {
-    my ( $self, $c ) = @_;
-
-    ## this allows anyone to login regardless of status.
-    eval {
-        $c->authenticate({ username => $c->request->params->{'username'},
-                           password => $c->request->params->{'password'}
-                         });
-        1;
-    } or do {
-        return $c->res->body($@);
-    };
-
-    if ( $c->user_exists ) {
-        if ( $c->req->params->{detach} ) {
-            $c->detach( $c->req->params->{detach} );
-        }
-        $c->res->body( $c->user->get('username') . ' logged in' );
-    }
-    else {
-        $c->res->body( 'not logged in' );
-    }
-}
-
-
-sub notdisabled_login : Global {
-    my ( $self, $c ) = @_;
-
-    $c->authenticate({ username => $c->request->params->{'username'},
-                       password => $c->request->params->{'password'},
-                       status => [ 'active', 'registered' ]
-                     });
-
-    if ( $c->user_exists ) {
-        if ( $c->req->params->{detach} ) {
-            $c->detach( $c->req->params->{detach} );
-        }
-        $c->res->body( $c->user->get('username') .  ' logged in' );
-    }
-    else {
-        $c->res->body( 'not logged in' );
-    }
-}
-
-sub searchargs_login : Global {
-    my ( $self, $c ) = @_;
-
-    my $username = $c->request->params->{'username'} || '';
-    my $email = $c->request->params->{'email'} || '';
-    
-    $c->authenticate({ 
-                        password => $c->request->params->{'password'},
-                        dbix_class => {
-                            searchargs => [ { "-or" => [ username => $username,
-                                                        email => $email ]}, 
-                                            { prefetch => qw/ map_user_role /}
-                                          ]
-                        }
-                     });
-
-    if ( $c->user_exists ) {
-        if ( $c->req->params->{detach} ) {
-            $c->detach( $c->req->params->{detach} );
-        }
-        $c->res->body( $c->user->get('username') .  ' logged in' );
-    }
-    else {
-        $c->res->body( 'not logged in' );
-    }
-}
-
-sub resultset_login : Global {
-    my ( $self, $c ) = @_;
-
-    my $username = $c->request->params->{'username'} || '';
-    my $email = $c->request->params->{'email'} || '';
-    
-    
-    my $rs = $c->model('TestApp::User')->search({ "-or" => [ username => $username,
-                                                              email => $email ]});
-    
-    $c->authenticate({ 
-                        password => $c->request->params->{'password'},
-                        dbix_class => { resultset => $rs }
-                     });
-                     
-    if ( $c->user_exists ) {
-        if ( $c->req->params->{detach} ) {
-            $c->detach( $c->req->params->{detach} );
-        }
-        $c->res->body( $c->user->get('username') .  ' logged in' );
-    }
-    else {
-        $c->res->body( 'not logged in' );
-    }
-}
-
-sub bad_login : Global {
-    my ( $self, $c ) = @_;
-
-    ## this allows anyone to login regardless of status.
-    eval {
-        $c->authenticate({ william => $c->request->params->{'username'},
-                           the_bum => $c->request->params->{'password'}
-                         });
-        1;
-    } or do {
-        return $c->res->body($@);
-    };
-
-    if ( $c->user_exists ) {
-        if ( $c->req->params->{detach} ) {
-            $c->detach( $c->req->params->{detach} );
-        }
-        $c->res->body( $c->user->get('username') . ' logged in' );
-    }
-    else {
-        $c->res->body( 'not logged in' );
-    }
-}
-
-## need to add a resultset login test and a search args login test
-
-sub user_logout : Global {
-    my ( $self, $c ) = @_;
-
-    $c->logout;
-
-    if ( ! $c->user ) {
-        $c->res->body( 'logged out' );
-    }
-    else {
-        $c->res->body( 'not logged ok' );
-    }
-}
-
-sub get_session_user : Global {
-    my ( $self, $c ) = @_;
- 
-    if ( $c->user_exists ) {
-        $c->res->body($c->user->get('username')); # . " " . Dumper($c->user->get_columns()) );
-    }
-}
-
-sub is_admin : Global {
-    my ( $self, $c ) = @_;
-
-    eval {
-        if ( $c->assert_user_roles( qw/admin/ ) ) {
-            $c->res->body( 'ok' );
-        }
-    };
-    if ($@) {
-        $c->res->body( 'failed' );
-    }
-}
-
-sub is_admin_user : Global {
-    my ( $self, $c ) = @_;
-
-    eval {
-        if ( $c->assert_user_roles( qw/admin user/ ) ) {
-            $c->res->body( 'ok' );
-        }
-    };
-    if ($@) {
-        $c->res->body( 'failed' );
-    }
-}
-
-sub set_usersession : Global {
-    my ( $self, $c, $value ) = @_;
-    $c->user_session->{foo} = $value;
-    $c->res->body( 'ok' );
-}
-
-sub get_usersession : Global {
-    my ( $self, $c ) = @_;
-    $c->res->body( $c->user_session->{foo} || '' );
-}
-
-
 1;
diff --git a/t/lib/TestApp/Controller/Root.pm b/t/lib/TestApp/Controller/Root.pm
new file mode 100644
index 0000000..37e40f9
--- /dev/null
+++ b/t/lib/TestApp/Controller/Root.pm
@@ -0,0 +1,192 @@
+package TestApp::Controller::Root;
+
+use Moose;
+
+BEGIN { extends 'Catalyst::Controller' }
+
+__PACKAGE__->config(namespace => '');
+
+sub user_login : Global {
+    my ( $self, $c ) = @_;
+
+    ## this allows anyone to login regardless of status.
+    eval {
+        $c->authenticate({ username => $c->request->params->{'username'},
+                           password => $c->request->params->{'password'}
+                         });
+        1;
+    } or do {
+        return $c->res->body($@);
+    };
+
+    if ( $c->user_exists ) {
+        if ( $c->req->params->{detach} ) {
+            $c->detach( $c->req->params->{detach} );
+        }
+        $c->res->body( $c->user->get('username') . ' logged in' );
+    }
+    else {
+        $c->res->body( 'not logged in' );
+    }
+}
+
+
+sub notdisabled_login : Global {
+    my ( $self, $c ) = @_;
+
+    $c->authenticate({ username => $c->request->params->{'username'},
+                       password => $c->request->params->{'password'},
+                       status => [ 'active', 'registered' ]
+                     });
+
+    if ( $c->user_exists ) {
+        if ( $c->req->params->{detach} ) {
+            $c->detach( $c->req->params->{detach} );
+        }
+        $c->res->body( $c->user->get('username') .  ' logged in' );
+    }
+    else {
+        $c->res->body( 'not logged in' );
+    }
+}
+
+sub searchargs_login : Global {
+    my ( $self, $c ) = @_;
+
+    my $username = $c->request->params->{'username'} || '';
+    my $email = $c->request->params->{'email'} || '';
+
+    $c->authenticate({
+                        password => $c->request->params->{'password'},
+                        dbix_class => {
+                            searchargs => [ { "-or" => [ username => $username,
+                                                        email => $email ]},
+                                            { prefetch => qw/ map_user_role /}
+                                          ]
+                        }
+                     });
+
+    if ( $c->user_exists ) {
+        if ( $c->req->params->{detach} ) {
+            $c->detach( $c->req->params->{detach} );
+        }
+        $c->res->body( $c->user->get('username') .  ' logged in' );
+    }
+    else {
+        $c->res->body( 'not logged in' );
+    }
+}
+
+sub resultset_login : Global {
+    my ( $self, $c ) = @_;
+
+    my $username = $c->request->params->{'username'} || '';
+    my $email = $c->request->params->{'email'} || '';
+
+
+    my $rs = $c->model('TestApp::User')->search({ "-or" => [ username => $username,
+                                                              email => $email ]});
+
+    $c->authenticate({
+                        password => $c->request->params->{'password'},
+                        dbix_class => { resultset => $rs }
+                     });
+
+    if ( $c->user_exists ) {
+        if ( $c->req->params->{detach} ) {
+            $c->detach( $c->req->params->{detach} );
+        }
+        $c->res->body( $c->user->get('username') .  ' logged in' );
+    }
+    else {
+        $c->res->body( 'not logged in' );
+    }
+}
+
+sub bad_login : Global {
+    my ( $self, $c ) = @_;
+
+    ## this allows anyone to login regardless of status.
+    eval {
+        $c->authenticate({ william => $c->request->params->{'username'},
+                           the_bum => $c->request->params->{'password'}
+                         });
+        1;
+    } or do {
+        return $c->res->body($@);
+    };
+
+    if ( $c->user_exists ) {
+        if ( $c->req->params->{detach} ) {
+            $c->detach( $c->req->params->{detach} );
+        }
+        $c->res->body( $c->user->get('username') . ' logged in' );
+    }
+    else {
+        $c->res->body( 'not logged in' );
+    }
+}
+
+## need to add a resultset login test and a search args login test
+
+sub user_logout : Global {
+    my ( $self, $c ) = @_;
+
+    $c->logout;
+
+    if ( ! $c->user ) {
+        $c->res->body( 'logged out' );
+    }
+    else {
+        $c->res->body( 'not logged ok' );
+    }
+}
+
+sub get_session_user : Global {
+    my ( $self, $c ) = @_;
+
+    if ( $c->user_exists ) {
+        $c->res->body($c->user->get('username')); # . " " . Dumper($c->user->get_columns()) );
+    }
+}
+
+sub is_admin : Global {
+    my ( $self, $c ) = @_;
+
+    eval {
+        if ( $c->assert_user_roles( qw/admin/ ) ) {
+            $c->res->body( 'ok' );
+        }
+    };
+    if ($@) {
+        $c->res->body( 'failed' );
+    }
+}
+
+sub is_admin_user : Global {
+    my ( $self, $c ) = @_;
+
+    eval {
+        if ( $c->assert_user_roles( qw/admin user/ ) ) {
+            $c->res->body( 'ok' );
+        }
+    };
+    if ($@) {
+        $c->res->body( 'failed' );
+    }
+}
+
+sub set_usersession : Global {
+    my ( $self, $c, $value ) = @_;
+    $c->user_session->{foo} = $value;
+    $c->res->body( 'ok' );
+}
+
+sub get_usersession : Global {
+    my ( $self, $c ) = @_;
+    $c->res->body( $c->user_session->{foo} || '' );
+}
+
+__PACKAGE__->meta->make_immutable;
+
+1;