X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Ft%2Fweb%2Frights.t;h=c7e8aac005265433a357d683031d6161eca66c43;hb=de9d037528895f7151a9aead6724ce2df95f9586;hp=b47ba99af753657bc479cedab1b999c5ebd8719d;hpb=63a268637b2d51a8766412617724b9436439deb6;p=freeside.git

diff --git a/rt/t/web/rights.t b/rt/t/web/rights.t
index b47ba99af..c7e8aac00 100644
--- a/rt/t/web/rights.t
+++ b/rt/t/web/rights.t
@@ -1,4 +1,3 @@
-#!/usr/bin/perl -w
 use strict;
 use warnings;
 
@@ -7,34 +6,32 @@ use RT::Test tests => 14;
 my ($baseurl, $m) = RT::Test->started_ok;
 ok $m->login, "logged in";
 
-$m->follow_link_ok({ text => 'Configuration' });
-$m->follow_link_ok({ text => 'Global' });
-$m->follow_link_ok({ text => 'Group Rights' });
+$m->follow_link_ok({ id => 'admin-global-group-rights'});
 
 
 sub get_rights {
     my $agent = shift;
     my $principal_id = shift;
     my $object = shift;
-    $agent->form_number(3);
-    my @inputs = $agent->current_form->find_input("RevokeRight-$principal_id-$object");
-    my @rights = sort grep $_, map $_->possible_values, grep $_, @inputs;
+    $agent->form_name('ModifyGroupRights');
+    my @inputs = $agent->current_form->find_input("SetRights-$principal_id-$object");
+    my @rights = sort grep $_, map $_->possible_values, grep $_ && $_->value, @inputs;
     return @rights;
 };
 
-diag "load Everyone group" if $ENV{'TEST_VERBOSE'};
+diag "load Everyone group";
 my ($everyone, $everyone_gid);
 {
-    $everyone = RT::Group->new( $RT::SystemUser );
+    $everyone = RT::Group->new( RT->SystemUser );
     $everyone->LoadSystemInternalGroup('Everyone');
     ok($everyone_gid = $everyone->id, "loaded 'everyone' group");
 }
 
-diag "revoke all global rights from Everyone group" if $ENV{'TEST_VERBOSE'};
+diag "revoke all global rights from Everyone group";
 my @has = get_rights( $m, $everyone_gid, 'RT::System-1' );
 if ( @has ) {
-    $m->form_number(3);
-    $m->tick("RevokeRight-$everyone_gid-RT::System-1", $_) foreach @has;
+    $m->form_name('ModifyGroupRights');
+    $m->untick("SetRights-$everyone_gid-RT::System-1", $_) foreach @has;
     $m->submit;
     
     is_deeply([get_rights( $m, $everyone_gid, 'RT::System-1' )], [], 'deleted all rights' );
@@ -42,10 +39,10 @@ if ( @has ) {
     ok(1, 'the group has no global rights');
 }
 
-diag "grant SuperUser right to everyone" if $ENV{'TEST_VERBOSE'};
+diag "grant SuperUser right to everyone";
 {
-    $m->form_number(3);
-    $m->select("GrantRight-$everyone_gid-RT::System-1", ['SuperUser']);
+    $m->form_name('ModifyGroupRights');
+    $m->tick("SetRights-$everyone_gid-RT::System-1", 'SuperUser');
     $m->submit;
 
     $m->content_contains('Right Granted', 'got message');
@@ -54,10 +51,10 @@ diag "grant SuperUser right to everyone" if $ENV{'TEST_VERBOSE'};
     is_deeply( [get_rights( $m, $everyone_gid, 'RT::System-1' )], ['SuperUser'], 'granted SuperUser right' );
 }
 
-diag "revoke the right" if $ENV{'TEST_VERBOSE'};
+diag "revoke the right";
 {
-    $m->form_number(3);
-    $m->tick("RevokeRight-$everyone_gid-RT::System-1", 'SuperUser');
+    $m->form_name('ModifyGroupRights');
+    $m->untick("SetRights-$everyone_gid-RT::System-1", 'SuperUser');
     $m->submit;
 
     $m->content_contains('Right revoked', 'got message');
@@ -67,10 +64,10 @@ diag "revoke the right" if $ENV{'TEST_VERBOSE'};
 }
 
 
-diag "return rights the group had in the beginning" if $ENV{'TEST_VERBOSE'};
+diag "return rights the group had in the beginning";
 if ( @has ) {
-    $m->form_number(3);
-    $m->select("GrantRight-$everyone_gid-RT::System-1", \@has);
+    $m->form_name('ModifyGroupRights');
+    $m->tick("SetRights-$everyone_gid-RT::System-1", $_) for @has;
     $m->submit;
 
     $m->content_contains('Right Granted', 'got message');