[Rt-commit] r18722 - in rt/3.999/trunk: lib/RT/Model t/api t/mail
ruz at bestpractical.com
ruz at bestpractical.com
Thu Mar 5 20:14:50 EST 2009
Author: ruz
Date: Thu Mar 5 20:14:50 2009
New Revision: 18722
Modified:
rt/3.999/trunk/lib/RT/Model/Group.pm
rt/3.999/trunk/t/api/groups.t
rt/3.999/trunk/t/api/queue.t
rt/3.999/trunk/t/api/rights.t
rt/3.999/trunk/t/api/ticket.t
rt/3.999/trunk/t/mail/gateway.t
rt/3.999/trunk/t/ticket/deferred_owner.t
Log:
* change tests according to the latest changes in the API
Modified: rt/3.999/trunk/lib/RT/Model/Group.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/Group.pm (original)
+++ rt/3.999/trunk/lib/RT/Model/Group.pm Thu Mar 5 20:14:50 2009
@@ -754,7 +754,6 @@
}
-
=head2 user_members
Returns an L<RT::Model::UserCollection> object of this group's members, by default
@@ -794,11 +793,11 @@
return ($users);
}
+
=head2 member_emails
Returns an array of the email addresses of all of this group's members
-
=cut
sub member_emails {
Modified: rt/3.999/trunk/t/api/groups.t
==============================================================================
--- rt/3.999/trunk/t/api/groups.t (original)
+++ rt/3.999/trunk/t/api/groups.t Thu Mar 5 20:14:50 2009
@@ -62,7 +62,7 @@
ok ($id,$msg);
my $global_admin_cc = RT::Model::Group->new(current_user => RT->system_user);
-$global_admin_cc->load_system_role_group('admin_cc');
+$global_admin_cc->load_role_group(object => RT->system, type => 'admin_cc');
ok($global_admin_cc->id, "Found the global admincc group");
my $groups = RT::Model::GroupCollection->new(current_user => RT->system_user);
$groups->with_right(right => 'OwnTicket', object => $q);
Modified: rt/3.999/trunk/t/api/queue.t
==============================================================================
--- rt/3.999/trunk/t/api/queue.t (original)
+++ rt/3.999/trunk/t/api/queue.t Thu Mar 5 20:14:50 2009
@@ -2,85 +2,79 @@
use strict;
use warnings;
use RT::Test; use Test::More;
-plan tests => 24;
+plan tests => 27;
use RT;
-{
-
-
use RT::Model::Queue;
-my $q = RT::Model::Queue->new(current_user => RT->system_user);
-is($q->status_schema->is_valid('new'), 1, 'New is a valid status');
-is($q->status_schema->is_valid('f00'), 0, 'f00 is not a valid status');
-
-
-}
{
+ my $q = RT::Model::Queue->new(current_user => RT->system_user);
-my $q = RT::Model::Queue->new(current_user => RT->system_user);
-is($q->status_schema->is_active('open'), 1, 'Open is a Active status');
-is($q->status_schema->is_active('rejected'), 0, 'Rejected is an inactive status');
-is($q->status_schema->is_active('f00'), 0, 'f00 is not a Active status');
+ is($q->status_schema->is_valid('new'), 1, 'New is a valid status');
+ is($q->status_schema->is_valid('f00'), 0, 'f00 is not a valid status');
+ is($q->status_schema->is_active('open'), 1, 'Open is a Active status');
+ is($q->status_schema->is_active('rejected'), 0, 'Rejected is an inactive status');
+ is($q->status_schema->is_active('f00'), 0, 'f00 is not a Active status');
+ is($q->status_schema->is_inactive('new'), 0, 'New is a Active status');
+ is($q->status_schema->is_inactive('rejected'), 1, 'rejeected is an Inactive status');
+ is($q->status_schema->is_inactive('f00'), 0, 'f00 is not a Active status');
}
{
+ my $queue = RT::Model::Queue->new(current_user => RT->system_user);
+ my ($id, $val) = $queue->create( name => 'Test1');
+ ok($id, $val);
-my $q = RT::Model::Queue->new(current_user => RT->system_user);
-is($q->status_schema->is_inactive('new'), 0, 'New is a Active status');
-is($q->status_schema->is_inactive('rejected'), 1, 'rejeected is an Inactive status');
-is($q->status_schema->is_inactive('f00'), 0, 'f00 is not a Active status');
-
-
+ ($id, $val) = $queue->create( name => '66');
+ ok(!$id, $val);
}
-{
-
-my $queue = RT::Model::Queue->new(current_user => RT->system_user);
-my ($id, $val) = $queue->create( name => 'Test1');
-ok($id, $val);
-
-($id, $val) = $queue->create( name => '66');
-ok(!$id, $val);
-
-
-}
-
-{
-
my $Queue = RT::Model::Queue->new(current_user => RT->system_user);
my ($id, $msg) = $Queue->create(name => "Foo");
ok ($id, "Foo $id was Created");
-ok(my $group = RT::Model::Group->new(current_user => RT->system_user));
-ok($group->load_queue_role_group(queue => $id, type=> 'requestor'));
-ok ($group->id, "Found the ccs object for this Queue");
{
+ my $group = RT::Model::Group->new(current_user => RT->system_user);
+ ok($group->load_role_group(object => $Queue, type=> 'cc'));
+ ok (!$group->id, "No cc group as there are no ccs yet");
+
my ($status, $msg) = $Queue->add_watcher(type => 'cc', email => 'bob at fsck.com');
- ok ($status, "Added bob at fsck.com as a requestor") or diag "error: $msg";
-}
-ok(my $bob = RT::Model::User->new(current_user => RT->system_user), "Creating a bob rt::user");
-$bob->load_by_email('bob at fsck.com');
-ok($bob->id, "Found the bob rt user");
-ok ($Queue->is_watcher(type => 'cc', principal_id => $bob->principal_id), "The queue actually has bob at fsck.com as a requestor");
+ ok ($status, "Added bob at fsck.com as a cc") or diag "error: $msg";
-{
- my ($status, $msg) = $Queue->delete_watcher(type =>'cc', email => 'bob at fsck.com');
+ $group = RT::Model::Group->new(current_user => RT->system_user);
+ ok ($group->load_role_group(object => $Queue, type=> 'cc'));
+ ok ($group->id, "Found the cc object for this Queue");
+
+ ok (my $bob = RT::Model::User->new(current_user => RT->system_user), "Creating a bob rt::user");
+ $bob->load_by_email('bob at fsck.com');
+ ok ($bob->id, "Found the bob rt user");
+
+ ok ($Queue->is_watcher(type => 'cc', principal_id => $bob->principal_id),
+ "The queue actually has bob at fsck.com as a requestor");
+ ok ($Queue->is_watcher(type => 'cc', email => $bob->email),
+ "The queue actually has bob at fsck.com as a requestor");
+
+ ok (!$Queue->is_watcher(type => 'admin_cc', principal_id => $bob->principal_id),
+ "bob is not an admin cc");
+ ok (!$Queue->is_watcher(type => 'admin_cc', email => $bob->email),
+ "bob is not an admin cc");
+
+ ($status, $msg) = $Queue->delete_watcher(type =>'cc', email => 'bob at fsck.com');
ok ($status, "Deleted bob from Ccs") or diag "error: $msg";
+
ok (!$Queue->is_watcher(type => 'cc', principal_id => $bob->principal_id),
"The queue no longer has bob at fsck.com as a requestor");
-}
-
-$group = RT::Model::Group->new(current_user => RT->system_user);
-ok($group->load_queue_role_group(queue => $id, type=> 'cc'));
-ok ($group->id, "Found the cc object for this Queue");
-$group = RT::Model::Group->new(current_user => RT->system_user);
-ok($group->load_queue_role_group(queue => $id, type=> 'admin_cc'));
-ok ($group->id, "Found the admin_cc object for this Queue");
+ ok (!$Queue->is_watcher(type => 'cc', email => $bob->email),
+ "The queue no longer has bob at fsck.com as a requestor");
+}
+{
+ my $group = RT::Model::Group->new(current_user => RT->system_user);
+ ok($group->load_role_group(object => $Queue, type=> 'admin_cc'));
+ ok (!$group->id, "No admin_cc group as there are no admin ccs yet");
}
1;
Modified: rt/3.999/trunk/t/api/rights.t
==============================================================================
--- rt/3.999/trunk/t/api/rights.t (original)
+++ rt/3.999/trunk/t/api/rights.t Thu Mar 5 20:14:50 2009
@@ -87,7 +87,7 @@
ok( !$user->has_right( right => 'ReplyToTicket', object => $queue ), "user can't reply to ticket" );
my $group = RT::Model::Group->new(current_user => RT->system_user );
-ok( $group->load_queue_role_group( queue => $queue_id, type=> 'owner' ), "load queue owners role group" );
+ok( $group->create_role_group( object => $queue, type=> 'owner' ), "load queue owners role group" );
my $ace = RT::Model::ACE->new(current_user => RT->system_user );
my ($ace_id, $msg) = $group->principal->grant_right( right => 'ReplyToTicket', object => $queue );
ok( $ace_id, "Granted queue owners role group with ReplyToTicket right: $msg" );
@@ -113,7 +113,7 @@
# Testing of equiv_objects
$group = RT::Model::Group->new(current_user => RT->system_user );
-ok( $group->load_queue_role_group( queue => $queue_id, type=> 'admin_cc' ), "load queue admin_cc role group" );
+ok( $group->create_role_group( object => $queue, type=> 'admin_cc' ), "load queue admin_cc role group" );
$ace = RT::Model::ACE->new(current_user => RT->system_user );
($ace_id, $msg) = $group->principal->grant_right( right => 'ModifyTicket', object => $queue );
ok( $ace_id, "Granted queue admin_cc role group with ModifyTicket right: $msg" );
Modified: rt/3.999/trunk/t/api/ticket.t
==============================================================================
--- rt/3.999/trunk/t/api/ticket.t (original)
+++ rt/3.999/trunk/t/api/ticket.t Thu Mar 5 20:14:50 2009
@@ -109,7 +109,7 @@
);
ok ($id, "Ticket $id was Created");
ok(my $group = RT::Model::Group->new(current_user => RT->system_user));
-ok($group->load_ticket_role_group(ticket => $id, type=> 'requestor'));
+ok($group->load_role_group(object => $ticket, type=> 'requestor'));
ok ($group->id, "Found the requestors object for this ticket");
ok(my $jesse = RT::Model::User->new(current_user => RT->system_user), "Creating a jesse rt::user");
@@ -129,18 +129,19 @@
$group = RT::Model::Group->new(current_user => RT->system_user);
-ok($group->load_ticket_role_group(ticket => $id, type => 'cc'));
-ok ($group->id, "Found the cc object for this ticket");
+ok($group->load_role_group(object => $ticket, type => 'cc'));
+ok (!$group->id, "Not found the cc object for this ticket");
+
$group = RT::Model::Group->new(current_user => RT->system_user);
-ok($group->load_ticket_role_group(ticket => $id, type=> 'admin_cc'));
-ok ($group->id, "Found the admin_cc object for this ticket");
+ok($group->load_role_group(object => $ticket, type=> 'admin_cc'));
+ok ($group->id, "Not found the admin_cc object for this ticket");
+
$group = RT::Model::Group->new(current_user => RT->system_user);
-ok($group->load_ticket_role_group(ticket => $id, type=> 'owner'));
+ok($group->load_role_group(object => $ticket, type=> 'owner'));
ok ($group->id, "Found the owner object for this ticket");
ok($group->has_member(RT->nobody->user_object->principal), "the owner group has the member 'RT_System'");
-
$t = RT::Model::Ticket->new(current_user => RT->system_user);
ok($t->create(queue => 'general', subject => 'SquelchTest'));
@@ -184,7 +185,7 @@
is ($t1->id, $t2->id);
-is ($t1->role_group("requestor")->members_obj->count, 2);
+is ($t1->role_group("requestor")->members->count, 2);
}
Modified: rt/3.999/trunk/t/mail/gateway.t
==============================================================================
--- rt/3.999/trunk/t/mail/gateway.t (original)
+++ rt/3.999/trunk/t/mail/gateway.t Thu Mar 5 20:14:50 2009
@@ -774,7 +774,7 @@
my $group = RT::Model::Group->new(current_user => RT->system_user );
-ok( $group->load_queue_role_group( queue => $qid, type=> 'Owner' ), "load queue owners role group" );
+ok( $group->create_role_group( object => $queue, type=> 'owner' ), "load queue owners role group" );
$ace = RT::Model::ACE->new(current_user => RT->system_user );
($ace_id, $msg) = $group->principal->grant_right( right => 'ReplyToTicket', object => $queue );
ok( $ace_id, "Granted queue owners role group with ReplyToTicket right" );
Modified: rt/3.999/trunk/t/ticket/deferred_owner.t
==============================================================================
--- rt/3.999/trunk/t/ticket/deferred_owner.t (original)
+++ rt/3.999/trunk/t/ticket/deferred_owner.t Thu Mar 5 20:14:50 2009
@@ -18,7 +18,7 @@
ok $queue && $queue->id, 'loaded or created queue';
my $owner_role_group = RT::Model::Group->new(current_user => RT->system_user );
-$owner_role_group->load_queue_role_group( type => 'owner', queue => $queue->id );
+$owner_role_group->create_role_group( type => 'owner', object => $queue );
ok $owner_role_group->id, 'loaded owners role group of the queue';
diag "check that deffering owner doesn't regress" if $ENV{'TEST_VERBOSE'};
More information about the Rt-commit
mailing list