Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / rt / t / web / search_rss.t

diff --git a/rt/t/web/search_rss.t b/rt/t/web/search_rss.t
index 454dc03..7f1fdc1 100644 (file)
--- a/rt/t/web/search_rss.t
+++ b/rt/t/web/search_rss.t
@@ -1,11 +1,10 @@
-#!/usr/bin/perl
-
 use strict;
+use warnings;
 
-use RT::Test tests => 36;
-RT::Test->started_ok;
+use RT::Test tests => 38;
+my ($baseurl, $agent) = RT::Test->started_ok;
 
-my $ticket = RT::Ticket->new($RT::SystemUser);
+my $ticket = RT::Ticket->new(RT->SystemUser);
 for ( 1 .. 5 ) {
     $ticket->Create(
         Subject   => 'Ticket ' . $_,
@@ -15,7 +14,6 @@ for ( 1 .. 5 ) {
     );
 }
 
-my $agent = RT::Test::Web->new;
 ok $agent->login('root', 'password'), 'logged in as root';
 
 $agent->get_ok('/Search/Build.html');
@@ -23,7 +21,7 @@ $agent->form_name('BuildQuery');
 $agent->field('idOp', '>');
 $agent->field('ValueOfid', '0');
 $agent->submit('DoSearch');
-$agent->follow_link_ok({text=>'Show Results'});
+$agent->follow_link_ok({id => 'page-results'});
 
 for ( 1 .. 5 ) {
     $agent->content_contains('Ticket ' . $_);
@@ -41,14 +39,11 @@ my $rss_content = $agent->content;
 $agent->get_ok($rdf_path);
 is($agent->content, $rss_content, 'old Results.rdf still works');
 
-SKIP: {
-    eval { require XML::Simple; };
-    skip 'no XML::Simple found', 6 if $@;
-    my $rss = XML::Simple::XMLin( $rss_content );
-    is( scalar @{ $rss->{item} }, 5, 'item number' );
-    for ( 1 .. 5 ) {
-        is( $rss->{item}[$_-1]{title}, 'Ticket ' . $_, 'title' . $_ );
-    }
+use XML::Simple;
+my $rss = XML::Simple::XMLin( $rss_content );
+is( scalar @{ $rss->{item} }, 5, 'item number' );
+for ( 1 .. 5 ) {
+    is( $rss->{item}[$_-1]{title}, 'Ticket ' . $_, 'title' . $_ );
 }
 
 # not login at all
@@ -64,7 +59,7 @@ my $user_b = RT::Test->load_or_create_user(
     Name => 'user_b', Password => 'password',
 );
 ok $user_b && $user_b->id, 'loaded or created user';
-$agent_b->login('user_b', 'password'), 'logged in as user B';
+$agent_b->login('user_b', 'password');
 $agent_b->get_ok($noauth_uri);
 is( $agent_b->content_type, 'application/rss+xml', 'content type' );
 is( $agent_b->content, $rss_content, 'content' );