X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Ft%2Fweb%2Fbasic.t;h=79c247d247905cfe482f6510d3645cf0f035b086;hb=de9d037528895f7151a9aead6724ce2df95f9586;hp=bc4d655870bbca181e7952a690df536e8d2c087a;hpb=b4b0c7e72d7eaee2fbfc7022022c9698323203dd;p=freeside.git

diff --git a/rt/t/web/basic.t b/rt/t/web/basic.t
index bc4d65587..79c247d24 100644
--- a/rt/t/web/basic.t
+++ b/rt/t/web/basic.t
@@ -1,47 +1,36 @@
-#!/usr/bin/perl
 
 use strict;
 use warnings;
-use Encode;
 
 use RT::Test tests => 24;
-$RT::Test::SKIP_REQUEST_WORK_AROUND = 1;
 
 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
 {
-    ok($agent->{form}->find_input('user'));
-    ok($agent->{form}->find_input('pass'));
-
-    ok($agent->{'content'} =~ /username:/i);
-    $agent->field( 'user' => 'root' );
-    $agent->field( 'pass' => 'password' );
-
+    $agent->login('root' => 'password');
     # the field isn't named, so we have to click link 0
-    $agent->click(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);
-    my $string = Encode::decode_utf8("I18N Web Testing æøå");
+    $agent->goto_create_ticket(1);
+    is ($agent->status, 200, "Loaded Create.html");
+    $agent->form_name('TicketCreate');
+    my $string = Encode::decode("UTF-8","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");
 
     {
@@ -55,15 +44,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 æøå");
+    my $string = Encode::decode( "UTF-8","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");
 
     {
@@ -78,21 +67,19 @@ 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("5 hours", "5 hours is displayed");
+    $agent->content_contains("300 min", "but minutes is also");
 }
 
-# {{{ test an image
 
-TODO: {
-    todo_skip("Need to handle mason trying to compile images",1);
-$agent->get( $url."NoAuth/images/test.png" );
+$agent->get( $url."static/images/test.png" );
 my $file = RT::Test::get_relocatable_file(
   File::Spec->catfile(
-    qw(.. .. share html NoAuth images test.png)
+    qw(.. .. share static images test.png)
   )
 );
 is(
@@ -100,10 +87,7 @@ is(
     -s $file,
     "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
@@ -142,5 +126,3 @@ $query =~ s/\s+/ /g;
 
 is ($query, "Subject LIKE 'aaa' AND Subject LIKE 'bbb'");
 
-
-1;