first pass RT4 merge, RT#13852

1 files changed, 14 insertions, 21 deletions

diff --git a/rt/t/web/basic.t b/rt/t/web/basic.t
index 3f94e732f..31e28c406 100644
--- a/rt/t/web/basic.t
+++ b/rt/t/web/basic.t
@@ -4,37 +4,35 @@ use strict;
 use warnings;
 use Encode;
 
-use RT::Test tests => 21;
-$RT::Test::SKIP_REQUEST_WORK_AROUND = 1;
+use RT::Test tests => 23;
 
 my ($baseurl, $agent) = RT::Test->started_ok;
 
 my $url = $agent->rt_base_url;
-diag $url if $ENV{TEST_VERBOSE};
 
 # get the top page
 {
     $agent->get($url);
-    is ($agent->{'status'}, 200, "Loaded a page");
+    is ($agent->status, 200, "Loaded a page");
 }
 
 # test a login
 {
     $agent->login('root' => 'password');
     # the field isn't named, so we have to click link 0
-    is( $agent->{'status'}, 200, "Fetched the page ok");
-    ok( $agent->{'content'} =~ /Logout/i, "Found a logout link");
+    is( $agent->status, 200, "Fetched the page ok");
+    $agent->content_contains("Logout", "Found a logout link");
 }
 
 {
-    $agent->get($url."Ticket/Create.html?Queue=1");
-    is ($agent->{'status'}, 200, "Loaded Create.html");
-    $agent->form_number(3);
+    $agent->goto_create_ticket(1);
+    is ($agent->status, 200, "Loaded Create.html");
+    $agent->form_name('TicketCreate');
     my $string = Encode::decode_utf8("I18N Web Testing æøå");
     $agent->field('Subject' => "Ticket with utf8 body");
     $agent->field('Content' => $string);
     ok($agent->submit, "Created new ticket with $string as Content");
-    $agent->content_like( qr{$string} , "Found the content");
+    $agent->content_contains($string, "Found the content");
     ok($agent->{redirected_uri}, "Did redirection");
 
     {
@@ -48,15 +46,15 @@ diag $url if $ENV{TEST_VERBOSE};
 }
 
 {
-    $agent->get($url."Ticket/Create.html?Queue=1");
-    is ($agent->{'status'}, 200, "Loaded Create.html");
-    $agent->form_number(3);
+    $agent->goto_create_ticket(1);
+    is ($agent->status, 200, "Loaded Create.html");
+    $agent->form_name('TicketCreate');
 
     my $string = Encode::decode_utf8("I18N Web Testing æøå");
     $agent->field('Subject' => $string);
     $agent->field('Content' => "Ticket with utf8 subject");
     ok($agent->submit, "Created new ticket with $string as Content");
-    $agent->content_like( qr{$string} , "Found the content");
+    $agent->content_contains($string, "Found the content");
     ok($agent->{redirected_uri}, "Did redirection");
 
     {
@@ -71,14 +69,13 @@ diag $url if $ENV{TEST_VERBOSE};
 # Update time worked in hours
 {
     $agent->follow_link( text_regex => qr/Basics/ );
-    $agent->submit_form( form_number => 3,
+    $agent->submit_form( form_name => 'TicketModify',
         fields => { TimeWorked => 5, 'TimeWorked-TimeUnits' => "hours" }
     );
 
-    like ($agent->{'content'}, qr/to '300'/, "5 hours is 300 minutes");
+    $agent->content_contains("to '300'", "5 hours is 300 minutes");
 }
 
-# {{{ test an image
 
 TODO: {
     todo_skip("Need to handle mason trying to compile images",1);
@@ -94,9 +91,7 @@ is(
     "got a file of the correct size ($file)",
 );
 }
-# }}}
 
-# {{{ Query Builder tests
 #
 # XXX: hey-ho, we have these tests in t/web/query-builder
 # TODO: move everything about QB there
@@ -135,5 +130,3 @@ $query =~ s/\s+/ /g;
 
 is ($query, "Subject LIKE 'aaa' AND Subject LIKE 'bbb'");
 
-
-1;