[Catalyst-commits] r13997 - in trunk/Catalyst-Plugin-Authorization-Roles: lib/Catalyst/Plugin/Authorization t

[abraxxa at dev.catalyst.perl.org]

Author: abraxxa
Date: 2011-04-14 08:22:13 +0000 (Thu, 14 Apr 2011)
New Revision: 13997

Modified:
   trunk/Catalyst-Plugin-Authorization-Roles/lib/Catalyst/Plugin/Authorization/Roles.pm
   trunk/Catalyst-Plugin-Authorization-Roles/t/basic.t
Log:
tests + fixes for RT#66812


Modified: trunk/Catalyst-Plugin-Authorization-Roles/lib/Catalyst/Plugin/Authorization/Roles.pm
===================================================================
--- trunk/Catalyst-Plugin-Authorization-Roles/lib/Catalyst/Plugin/Authorization/Roles.pm	2011-04-04 18:55:50 UTC (rev 13996)
+++ trunk/Catalyst-Plugin-Authorization-Roles/lib/Catalyst/Plugin/Authorization/Roles.pm	2011-04-14 08:22:13 UTC (rev 13997)
@@ -15,6 +15,7 @@
     my ( $c, @roles ) = @_;
     local $@;
     eval { $c->assert_user_roles(@roles) };
+    return $@ ? 0 : 1;
 }
 
 sub assert_user_roles {
@@ -72,6 +73,7 @@
     my ( $c, @roles ) = @_;
     local $@;
     eval { $c->assert_any_user_role(@roles) };
+    return $@ ? 0 : 1;
 }
 
 sub assert_any_user_role {

Modified: trunk/Catalyst-Plugin-Authorization-Roles/t/basic.t
===================================================================
--- trunk/Catalyst-Plugin-Authorization-Roles/t/basic.t	2011-04-04 18:55:50 UTC (rev 13996)
+++ trunk/Catalyst-Plugin-Authorization-Roles/t/basic.t	2011-04-14 08:22:13 UTC (rev 13997)
@@ -29,11 +29,11 @@
 lives_ok { $c->assert_any_user_role( $user->roles ) } "assert_any_user_role: has all roles is OK";
 throws_ok { $c->assert_any_user_role( qw/moose_feeder climber/ ) } qr/missing role/i, "assert_any_user_role: has none of the listed roles";
 
-ok( $c->check_user_roles( "admin" ), "check_user_roles true" );
-ok( !$c->check_user_roles( "moose_feeder" ), "check_user_roles false" );
+is( $c->check_user_roles( "admin" ), 1, "check_user_roles true" );
+is( $c->check_user_roles( "moose_feeder" ), 0, "check_user_roles false" );
 
-ok( $c->check_any_user_role( qw/admin moose_feeder/ ), "check_any_user_role true" );
-ok( !$c->check_any_user_role( qw/moose_feeder climber/ ), "check_any_user_role false" );
+is( $c->check_any_user_role( qw/admin moose_feeder/ ), 1, "check_any_user_role true" );
+is( $c->check_any_user_role( qw/moose_feeder climber/ ), 0, "check_any_user_role false" );
 
 $c = MockAuthz->new(undef);