[Rt-commit] r16219 - in rt/branches/3.999-DANGEROUS: . t/shredder t/web
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Mon Oct 6 10:39:58 EDT 2008
Author: sunnavy
Date: Mon Oct 6 10:39:57 2008
New Revision: 16219
Modified:
rt/branches/3.999-DANGEROUS/ (props changed)
rt/branches/3.999-DANGEROUS/t/shredder/02group_member.t
rt/branches/3.999-DANGEROUS/t/ticket/deferred_owner.t
rt/branches/3.999-DANGEROUS/t/ticket/search_by_watcher.t
rt/branches/3.999-DANGEROUS/t/ticket/sort-by-user.t
rt/branches/3.999-DANGEROUS/t/web/ticket_owner.t
rt/branches/3.999-DANGEROUS/t/web/ticket_seen.t
Log:
r17036 at sunnavys-mb: sunnavy | 2008-10-06 22:37:12 +0800
owner returns user object now, fix tests accordingly
Modified: rt/branches/3.999-DANGEROUS/t/shredder/02group_member.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/shredder/02group_member.t (original)
+++ rt/branches/3.999-DANGEROUS/t/shredder/02group_member.t Mon Oct 6 10:39:57 2008
@@ -83,7 +83,7 @@
ok( $id, "load ticket" ) or diag( "error: $msg" );
($status, $msg) = $ticket->set_owner( $user->id );
ok( $status, "owner successfuly set") or diag( "error: $msg" );
- is( $ticket->owner, $user->id, "owner successfuly set") or diag( "error: $msg" );
+ is( $ticket->owner->id, $user->id, "owner successfuly set") or diag( "error: $msg" );
my $member = $ticket->owner_obj;
my $shredder = RT::Test::Shredder::shredder_new();
@@ -93,6 +93,6 @@
$ticket = RT::Model::Ticket->new(current_user => RT->system_user );
($status, $msg) = $ticket->load( $id );
ok( $id, "load ticket" ) or diag( "error: $msg" );
- is( $ticket->owner, RT->nobody->id, "owner switched back to nobody" );
+ is( $ticket->owner->id, RT->nobody->id, "owner switched back to nobody" );
is( $ticket->owner_obj->id, RT->nobody->id, "and owner role group member is nobody");
}
Modified: rt/branches/3.999-DANGEROUS/t/ticket/deferred_owner.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/ticket/deferred_owner.t (original)
+++ rt/branches/3.999-DANGEROUS/t/ticket/deferred_owner.t Mon Oct 6 10:39:57 2008
@@ -41,7 +41,7 @@
);
diag $msg if $msg && $ENV{'TEST_VERBOSE'};
ok $tid, "created a ticket";
- is $ticket->owner, $tester->id, 'correct owner';
+ is $ticket->owner->id, $tester->id, 'correct owner';
like $ticket->role_group("admin_cc")->member_emails_as_string, qr/root\@localhost/, 'root is there';
}
@@ -63,7 +63,7 @@
);
diag $msg if $msg && $ENV{'TEST_VERBOSE'};
ok $tid, "created a ticket";
- is $ticket->owner, $tester->id, 'correct owner';
+ is $ticket->owner->id, $tester->id, 'correct owner';
unlike $ticket->role_group("admin_cc")->member_emails_as_string, qr/root\@localhost/, 'root is there';
}
@@ -88,7 +88,7 @@
diag $msg if $msg && $ENV{'TEST_VERBOSE'};
ok $tid, "created a ticket";
like $ticket->role_group("cc")->member_emails_as_string, qr/tester\@localhost/, 'tester is in the cc list';
- is $ticket->owner, $tester->id, 'tester is also owner';
+ is $ticket->owner->id, $tester->id, 'tester is also owner';
}
diag "check that deffering doesn't work without correct rights" if $ENV{'TEST_VERBOSE'};
@@ -108,7 +108,7 @@
diag $msg if $msg && $ENV{'TEST_VERBOSE'};
ok $tid, "created a ticket";
like $ticket->role_group("cc")->member_emails_as_string, qr/tester\@localhost/, 'tester is in the cc list';
- isnt $ticket->owner, $tester->id, 'tester is also owner';
+ isnt $ticket->owner->id, $tester->id, 'tester is also owner';
}
Modified: rt/branches/3.999-DANGEROUS/t/ticket/search_by_watcher.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/ticket/search_by_watcher.t (original)
+++ rt/branches/3.999-DANGEROUS/t/ticket/search_by_watcher.t Mon Oct 6 10:39:57 2008
@@ -260,7 +260,7 @@
ok($u->id, "loaded user");
@data = ( { subject => '4', owner => $u->id } );
my($t) = add_tix_from_data();
- is( $t->owner, $u->id, "Created ticket with custom owner" );
+ is( $t->owner->id, $u->id, "Created ticket with custom owner" );
my $u_alpha_id = $u->id;
$u = RT::Model::User->new(current_user => RT->system_user );
@@ -268,7 +268,7 @@
ok($u->id, "loaded user");
@data = ( { subject => '5', owner => $u->id } );
($t) = add_tix_from_data();
- is( $t->owner, $u->id, "Created ticket with custom owner" );
+ is( $t->owner->id, $u->id, "Created ticket with custom owner" );
my $u_bravo_id = $u->id;
my $tix = RT::Model::TicketCollection->new(current_user => RT->system_user);
@@ -279,5 +279,3 @@
is($tix->count, 2, "found ticket(s)");
}
-
-exit(0)
Modified: rt/branches/3.999-DANGEROUS/t/ticket/sort-by-user.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/ticket/sort-by-user.t (original)
+++ rt/branches/3.999-DANGEROUS/t/ticket/sort-by-user.t Mon Oct 6 10:39:57 2008
@@ -59,7 +59,7 @@
my ( $id, undef, $msg ) = $t->create( %args, queue => $queue->id );
if ( $args{'owner'} ) {
- is $t->owner, $args{'owner'}, "owner is correct";
+ is $t->owner->id, $args{'owner'}, "owner is correct";
}
if ( $args{'creator'} ) {
is $t->creator->id, $args{'creator'}, "creator is correct";
Modified: rt/branches/3.999-DANGEROUS/t/web/ticket_owner.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/ticket_owner.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/ticket_owner.t Mon Oct 6 10:39:57 2008
@@ -49,7 +49,7 @@
my $ticket = RT::Model::Ticket->new(current_user => RT->system_user );
$ticket->load( $id );
ok $ticket->id, 'loaded the ticket';
- is $ticket->owner, RT->nobody->id, 'correct owner';
+ is $ticket->owner->id, RT->nobody->id, 'correct owner';
}
diag "user can chose owner of a new ticket" if $ENV{TEST_VERBOSE};
@@ -75,7 +75,7 @@
my $ticket = RT::Model::Ticket->new(current_user => RT->system_user );
$ticket->load( $id );
ok $ticket->id, 'loaded the ticket';
- is $ticket->owner, $user_b->id, 'correct owner';
+ is $ticket->owner->id, $user_b->id, 'correct owner';
}
my $agent_b = RT::Test::Web->new;
@@ -90,7 +90,7 @@
subject => 'test',
);
ok $id, 'created a ticket #'. $id or diag "error: $msg";
- is $ticket->owner, $user_b->id, 'correct owner';
+ is $ticket->owner->id, $user_b->id, 'correct owner';
# try the following group of tests twice with different agents(logins)
my $test_cb = sub {
@@ -111,7 +111,7 @@
my $ticket = RT::Model::Ticket->new(current_user => RT->system_user );
$ticket->load( $id );
ok $ticket->id, 'loaded the ticket';
- is $ticket->owner, $user_b->id, 'correct owner';
+ is $ticket->owner->id, $user_b->id, 'correct owner';
};
$test_cb->($agent_a);
@@ -128,7 +128,7 @@
subject => 'test',
);
ok $id, 'created a ticket #'. $id or diag "error: $msg";
- is $ticket->owner, $user_b->id, 'correct owner';
+ is $ticket->owner->id, $user_b->id, 'correct owner';
$agent_a->goto_ticket( $id );
$agent_a->follow_link_ok(text => 'Reply');
@@ -140,7 +140,7 @@
$ticket = RT::Model::Ticket->new(current_user => RT->system_user );
$ticket->load( $id );
ok $ticket->id, 'loaded the ticket';
- is $ticket->owner, $user_b->id, 'correct owner';
+ is $ticket->owner->id, $user_b->id, 'correct owner';
}
ok( RT::Test->set_rights(
@@ -156,7 +156,7 @@
subject => 'test',
);
ok $id, 'created a ticket #'. $id or diag "error: $msg";
- is $ticket->owner, RT->nobody->id, 'correct owner';
+ is $ticket->owner->id, RT->nobody->id, 'correct owner';
$agent_a->goto_ticket( $id );
ok !($agent_a->find_all_links( text => 'Take' ))[0],
@@ -174,7 +174,7 @@
subject => 'test',
);
ok $id, 'created a ticket #'. $id or diag "error: $msg";
- is $ticket->owner, $user_b->id, 'correct owner';
+ is $ticket->owner->id, $user_b->id, 'correct owner';
$agent_a->goto_ticket( $id );
ok !($agent_a->find_all_links( text => 'Steal' ))[0],
@@ -195,7 +195,7 @@
subject => 'test',
);
ok $id, 'created a ticket #'. $id or diag "error: $msg";
- is $ticket->owner, RT->nobody->id, 'correct owner';
+ is $ticket->owner->id, RT->nobody->id, 'correct owner';
$agent_a->goto_ticket( $id );
ok !($agent_a->find_all_links( text => 'Take' ))[0],
@@ -217,7 +217,7 @@
subject => 'test',
);
ok $id, 'created a ticket #'. $id or diag "error: $msg";
- is $ticket->owner, RT->nobody->id, 'correct owner';
+ is $ticket->owner->id, RT->nobody->id, 'correct owner';
$agent_a->goto_ticket( $id );
ok !($agent_a->find_all_links( text => 'Steal' ))[0],
@@ -227,7 +227,7 @@
$ticket = RT::Model::Ticket->new(current_user => RT->system_user );
$ticket->load( $id );
ok $ticket->id, 'loaded the ticket';
- is $ticket->owner, $user_a->id, 'correct owner';
+ is $ticket->owner->id, $user_a->id, 'correct owner';
}
diag "TakeTicket+OwnTicket don't work when owner is not nobody" if $ENV{TEST_VERBOSE};
@@ -239,7 +239,7 @@
subject => 'test',
);
ok $id, 'created a ticket #'. $id or diag "error: $msg";
- is $ticket->owner, $user_b->id, 'correct owner';
+ is $ticket->owner->id, $user_b->id, 'correct owner';
$agent_a->goto_ticket( $id );
ok !($agent_a->find_all_links( text => 'Take' ))[0],
@@ -262,7 +262,7 @@
subject => 'test',
);
ok $id, 'created a ticket #'. $id or diag "error: $msg";
- is $ticket->owner, $user_b->id, 'correct owner';
+ is $ticket->owner->id, $user_b->id, 'correct owner';
$agent_a->goto_ticket( $id );
ok !($agent_a->find_all_links( text => 'Steal' ))[0],
@@ -285,7 +285,7 @@
subject => 'test',
);
ok $id, 'created a ticket #'. $id or diag "error: $msg";
- is $ticket->owner, $user_b->id, 'correct owner';
+ is $ticket->owner->id, $user_b->id, 'correct owner';
$agent_a->goto_ticket( $id );
ok !($agent_a->find_all_links( text => 'Take' ))[0],
@@ -295,7 +295,7 @@
$ticket = RT::Model::Ticket->new(current_user => RT->system_user );
$ticket->load( $id );
ok $ticket->id, 'loaded the ticket';
- is $ticket->owner, $user_a->id, 'correct owner';
+ is $ticket->owner->id, $user_a->id, 'correct owner';
}
diag "StealTicket+OwnTicket don't work when owner is nobody" if $ENV{TEST_VERBOSE};
@@ -306,7 +306,7 @@
subject => 'test',
);
ok $id, 'created a ticket #'. $id or diag "error: $msg";
- is $ticket->owner, RT->nobody->id, 'correct owner';
+ is $ticket->owner->id, RT->nobody->id, 'correct owner';
$agent_a->goto_ticket( $id );
ok !($agent_a->find_all_links( text => 'Steal' ))[0],
@@ -328,7 +328,7 @@
subject => 'test',
);
ok $id, 'created a ticket #'. $id or diag "error: $msg";
- is $ticket->owner, RT->nobody->id, 'correct owner';
+ is $ticket->owner->id, RT->nobody->id, 'correct owner';
$agent_a->goto_ticket( $id );
ok !($agent_a->find_all_links( text => 'Steal' ))[0],
@@ -346,7 +346,7 @@
subject => 'test',
);
ok $id, 'created a ticket #'. $id or diag "error: $msg";
- is $ticket->owner, $user_b->id, 'correct owner';
+ is $ticket->owner->id, $user_b->id, 'correct owner';
$agent_a->goto_ticket( $id );
ok !($agent_a->find_all_links( text => 'Take' ))[0],
Modified: rt/branches/3.999-DANGEROUS/t/web/ticket_seen.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/ticket_seen.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/ticket_seen.t Mon Oct 6 10:39:57 2008
@@ -42,7 +42,7 @@
subject => 'test',
);
ok $tid, 'created a ticket #'. $tid or diag "error: $msg";
- is $ticket->owner, $user_a->id, 'correct owner';
+ is $ticket->owner->id, $user_a->id, 'correct owner';
}
diag "user B adds a message, we check that user A see notification and can clear it" if $ENV{TEST_VERBOSE};
More information about the Rt-commit
mailing list