[Rt-commit] r10712 - in rt/branches/3.999-DANGEROUS: html/REST/1.0/Forms/queue html/REST/1.0/Forms/user t/web
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Mon Feb 4 10:28:45 EST 2008
Author: sunnavy
Date: Mon Feb 4 10:28:38 2008
New Revision: 10712
Modified:
rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/queue/default
rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/default
rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/user/default
rt/branches/3.999-DANGEROUS/t/web/command_line.t
Log:
make the word cases in REST output the same as 3.6
Modified: rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/queue/default
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/queue/default (original)
+++ rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/queue/default Mon Feb 4 10:28:38 2008
@@ -64,7 +64,7 @@
if ($id ne 'new') {
$queue->load($id);
if (!$queue->id) {
- return [ "# queue $id does not exist.", [], {}, 1 ];
+ return [ "# Queue $id does not exist.", [], {}, 1 ];
}
}
else {
@@ -111,7 +111,7 @@
delete $data{id};
$id = $queue->id;
- push(@comments, "# queue $id Created.");
+ push(@comments, "# Queue $id created.");
goto DONE if keys %data == 0;
}
}
@@ -161,7 +161,7 @@
}
}
- push(@comments, "# queue $id updated.") unless $n == 0;
+ push(@comments, "# Queue $id updated.") unless $n == 0;
}
DONE:
Modified: rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/default
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/default (original)
+++ rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/default Mon Feb 4 10:28:38 2008
@@ -168,7 +168,7 @@
delete $data{id};
$id = $ticket->id;
- push(@comments, "# Ticket $id Created.");
+ push(@comments, "# Ticket $id created.");
# see if the hash is empty
goto DONE if ! keys(%data);
}
@@ -179,8 +179,8 @@
my ($time, $key, $val, @data);
push @data, [ id => "ticket/".$ticket->id ];
- push @data, [ queue => $ticket->queue_obj->name ]
- if (!%$fields || exists $fields->{lc 'queue'});
+ push @data, [ Queue => $ticket->queue_obj->name ]
+ if (!%$fields || exists $fields->{lc 'Queue'});
push @data, [ Owner => $ticket->owner_obj->name ]
if (!%$fields || exists $fields->{lc 'Owner'});
push @data, [ Creator => $ticket->creator_obj->name ]
@@ -188,19 +188,19 @@
foreach (qw(subject status priority initial_priority final_priority)) {
next unless (!%$fields || (exists $fields->{lc $_}));
- push @data, [$_ => $ticket->$_ ];
+ push @data, [ucfirst $_ => $ticket->$_ ];
}
foreach $key (@people) {
next unless (!%$fields || (exists $fields->{lc $key}));
- push @data, [ $key => [ $ticket->$key->member_emails ] ];
+ push @data, [ ucfirst $key => [ $ticket->$key->member_emails ] ];
}
$time = RT::Date->new();
foreach $key (@dates) {
next unless (!%$fields || (exists $fields->{lc $key}));
$time->set(format => 'sql', value => $ticket->$key);
- push @data, [ $key => $time->as_string ];
+ push @data, [ ucfirst $key => $time->as_string ];
}
$time = RT::Date->new();
@@ -208,7 +208,7 @@
next unless (!%$fields || (exists $fields->{lc $key}));
$val = $ticket->$key || 0;
$val = "$val minutes" if $val;
- push @data, [ $key => $val ];
+ push @data, [ ucfirst $key => $val ];
}
# Display custom fields
Modified: rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/user/default
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/user/default (original)
+++ rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/user/default Mon Feb 4 10:28:38 2008
@@ -108,7 +108,7 @@
$id = $user->id;
delete $data{id};
- push(@comments, "# User $id Created.");
+ push(@comments, "# User $id created.");
goto DONE if keys %data == 0;
}
}
Modified: rt/branches/3.999-DANGEROUS/t/web/command_line.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/command_line.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/command_line.t Mon Feb 4 10:28:38 2008
@@ -54,23 +54,23 @@
quit => 'quit',
);
expect_send(q{create -t ticket set subject='new ticket' add cc=foo at example.com}, "Creating a ticket...");
-expect_like(qr/Ticket \d+ Created/, "Created the ticket");
-expect_handle->before() =~ /Ticket (\d+) Created/;
+expect_like(qr/Ticket \d+ created/, "Created the ticket");
+expect_handle->before() =~ /Ticket (\d+) created/;
my $ticket_id = $1;
ok($ticket_id, "Got ticket id=$ticket_id");
expect_send(q{create -t ticket set subject='new ticket'}, "Creating a ticket as just a subject...");
-expect_like(qr/Ticket \d+ Created/, "Created the ticket");
+expect_like(qr/Ticket \d+ created/, "Created the ticket");
# make sure we can request things as 'rt foo'
expect_send(q{rt create -t ticket set subject='rt ticket'}, "Creating a ticket with 'rt create'...");
-expect_like(qr/Ticket \d+ Created/, "Created the ticket");
+expect_like(qr/Ticket \d+ created/, "Created the ticket");
# {{{ test queue manipulation
# creating queues
expect_send("create -t queue set name='NewQueue$$'", 'Creating a queue...');
-expect_like(qr/Queue \d+ Created/, 'Created the queue');
-expect_handle->before() =~ /Queue (\d+) Created/;
+expect_like(qr/Queue \d+ created/, 'Created the queue');
+expect_handle->before() =~ /Queue (\d+) created/;
my $queue_id = $1;
ok($queue_id, "Got queue id=$queue_id");
# updating users
@@ -220,8 +220,8 @@
# creating users
expect_send("create -t user set name='NewUser$$' email='fbar$$\@example.com'", 'Creating a user...');
-expect_like(qr/User \d+ Created/, 'Created the user');
-expect_handle->before() =~ /User (\d+) Created/;
+expect_like(qr/User \d+ created/, 'Created the user');
+expect_handle->before() =~ /User (\d+) created/;
my $user_id = $1;
ok($user_id, "Got user id=$user_id");
# updating users
@@ -244,7 +244,7 @@
todo_skip "Group manipulation doesn't work right now", 8;
# creating groups
expect_send("create -t group set name='NewGroup$$'", 'Creating a group...');
-expect_like(qr/Group \d+ Created/, 'Created the group');
+expect_like(qr/Group \d+ created/, 'Created the group');
expect_handle->before() =~ /Group (\d+) Created/;
my $group_id = $1;
ok($group_id, "Got group id=$group_id");
@@ -269,7 +269,7 @@
# creating custom fields
expect_send("create -t custom_field set name='NewCF$$'", 'Creating a custom field...');
-expect_like(qr/Custom Field \d+ Created/, 'Created the custom field');
+expect_like(qr/Custom Field \d+ created/, 'Created the custom field');
expect_handle->before() =~ /Custom Field (\d+) Created/;
my $cf_id = $1;
ok($cf_id, "Got custom field id=$cf_id");
@@ -290,13 +290,13 @@
# {{{ test merging tickets
expect_send("create -t ticket set subject='CLIMergeTest1-$$'", 'Creating first ticket to merge...');
-expect_like(qr/Ticket \d+ Created/, 'Created first ticket');
-expect_handle->before() =~ /Ticket (\d+) Created/;
+expect_like(qr/Ticket \d+ created/, 'Created first ticket');
+expect_handle->before() =~ /Ticket (\d+) created/;
my $merge_ticket_A = $1;
ok($merge_ticket_A, "Got first ticket to merge id=$merge_ticket_A");
expect_send("create -t ticket set subject='CLIMergeTest2-$$'", 'Creating second ticket to merge...');
-expect_like(qr/Ticket \d+ Created/, 'Created second ticket');
-expect_handle->before() =~ /Ticket (\d+) Created/;
+expect_like(qr/Ticket \d+ created/, 'Created second ticket');
+expect_handle->before() =~ /Ticket (\d+) created/;
my $merge_ticket_B = $1;
ok($merge_ticket_B, "Got second ticket to merge id=$merge_ticket_B");
expect_send("merge $merge_ticket_B $merge_ticket_A", 'Merging the tickets...');
@@ -336,8 +336,8 @@
# create a ticket to take/steal
expect_send("create -t ticket set queue=$steal_queue_id subject='CLIStealTest-$$'", 'Creating ticket to steal...');
- expect_like(qr/Ticket \d+ Created/, 'Created ticket');
- expect_handle->before() =~ /Ticket (\d+) Created/;
+ expect_like(qr/Ticket \d+ created/, 'Created ticket');
+ expect_handle->before() =~ /Ticket (\d+) created/;
my $steal_ticket_id = $1;
ok($steal_ticket_id, "Got ticket to steal id=$steal_ticket_id");
@@ -412,8 +412,8 @@
my $subject = shift;
expect_send("create -t ticket set subject='$subject'", 'Creating ticket...');
- expect_like(qr/Ticket \d+ Created/, "Created ticket '$subject'");
- expect_handle->before() =~ /Ticket (\d+) Created/;
+ expect_like(qr/Ticket \d+ created/, "Created ticket '$subject'");
+ expect_handle->before() =~ /Ticket (\d+) created/;
my $id = $1;
ok($id, "Got ticket id=$id");
More information about the Rt-commit
mailing list