[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-223-g51b6d6b

Ruslan Zakirov ruz at bestpractical.com
Fri Oct 22 17:02:13 EDT 2010


The branch, 3.9-trunk has been updated
       via  51b6d6be6745600b91b68d1bbdfcb538cf0a8e6c (commit)
       via  a6acfaae527542711e852ad8b21e3e3956aed419 (commit)
       via  5391f71d5f678f5e8ef7cee54a36468af5e980b6 (commit)
       via  b852039b05b88c6d3f55aa01e0e6711ab149d834 (commit)
       via  bfe54a96e908f00adce58fda0445cad811f76402 (commit)
       via  7edf068ccb74c33459ac8b1813fda74bc3ff2c07 (commit)
       via  c36bbd1e9fe0e03f2f3516995fad017502018abd (commit)
       via  0140bbd04f3141b0be37884d6cb4c7a3d78cbc84 (commit)
       via  70bead3660f3c23bcb1f0b32b523e2cfcc85d128 (commit)
       via  cb03b3576a731c98a7dfeb1068f3b4d508e7cc24 (commit)
       via  b82cf713dbce7e63db029b6a4b23bfdaa08be2e9 (commit)
       via  64ed1846f775d632f04951f7d84abe77606d785b (commit)
       via  dcde0c73e1077c3da13c2968a6d4250557ac1bc0 (commit)
       via  e48ba8460fc8019f513c4a5849b57ea5973bd514 (commit)
       via  86b9bac290acf62e7e341759227806034feba3cd (commit)
       via  dcddaa297a548b4f8fe179f27992504ff95327ac (commit)
       via  47faac81e705c6757b705d4f00bedd2d66906e8e (commit)
       via  a01bff5561c5f538e080503617b7475b8bb24033 (commit)
       via  53ee8972e5ad80f2dcc15011a51c5a913c3b58f6 (commit)
       via  e757284de3812314910b300cd59ce785f8247267 (commit)
       via  35347d98aa7f2d1b85640cb78039426861640f20 (commit)
       via  be6130c50317fa6af44c78e37c0e3118ac3c9da1 (commit)
       via  b30fb36d0db46854a94fd5b8ff233f50ad2055e1 (commit)
       via  129e3f3f62ac7ec5bad94564229456d1ffac7205 (commit)
       via  dceeb2377ab6721e11e09f17cf558e5811b20a31 (commit)
       via  90805dc5af43d9ef369b4524cdecc05e05c2a9f2 (commit)
       via  be330a82da8c1fd6d6f6c571c3cc617ae1eeca1e (commit)
       via  5000a8ee8d0fa18b313822201cd00dea4c7421b6 (commit)
       via  377f37fdd9eb479d105592634741b0f82372fab1 (commit)
       via  e10464d8705f8db3c6412a31152db498532ec793 (commit)
       via  240d3047398fd4d930f654ce6a54fb384eeef6ee (commit)
      from  e8e31f200b21410ecc2f81ea42cab775aa3c6640 (commit)

Summary of changes:
 .gitignore                                |    3 +
 Makefile.in                               |    2 +
 configure.ac                              |    2 +
 etc/RT_Config.pm.in                       |   21 +
 lib/RT/Interface/CLI.pm                   |   15 +-
 lib/RT/SearchBuilder.pm                   |   31 ++
 lib/RT/Test.pm                            |  136 +++---
 lib/RT/Tickets_Overlay.pm                 |  183 +++++---
 sbin/rt-fulltext-indexer.in               |  465 +++++++++++++++++++
 sbin/rt-setup-fulltext-index.in           |  703 +++++++++++++++++++++++++++++
 share/html/Elements/SelectAttachmentField |    2 +
 t/fts/indexed_oracle.t                    |   80 ++++
 t/fts/indexed_pg.t                        |   80 ++++
 t/ticket/cfsort-freeform-multiple.t       |    6 +-
 t/ticket/cfsort-freeform-single.t         |    8 +-
 t/ticket/search_by_cf_freeform_multiple.t |    2 +-
 t/ticket/search_by_cf_freeform_single.t   |    2 +-
 t/ticket/search_by_links.t                |   17 +-
 t/ticket/search_by_watcher.t              |   19 +-
 t/ticket/sort-by-queue.t                  |    6 +-
 t/ticket/sort-by-user.t                   |    7 +-
 21 files changed, 1623 insertions(+), 167 deletions(-)
 create mode 100644 sbin/rt-fulltext-indexer.in
 create mode 100644 sbin/rt-setup-fulltext-index.in
 create mode 100644 t/fts/indexed_oracle.t
 create mode 100644 t/fts/indexed_pg.t

- Log -----------------------------------------------------------------
commit 5391f71d5f678f5e8ef7cee54a36468af5e980b6
Merge: e8e31f2 b852039
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Fri Oct 22 02:46:59 2010 +0400

    Merge branch 'fts' into 3.9-trunk
    
    Conflicts:
    	Makefile.in
    	t/ticket/cfsort-freeform-multiple.t
    	t/ticket/cfsort-freeform-single.t
    	t/ticket/search_by_cf_freeform_multiple.t
    	t/ticket/search_by_cf_freeform_single.t
    	t/ticket/search_by_links.t
    	t/ticket/search_by_watcher.t
    	t/ticket/sort-by-queue.t
    	t/ticket/sort-by-user.t

diff --cc t/ticket/cfsort-freeform-multiple.t
index 4319670,97492ac..45e5af3
--- a/t/ticket/cfsort-freeform-multiple.t
+++ b/t/ticket/cfsort-freeform-multiple.t
@@@ -36,8 -36,35 +36,10 @@@ my $cf
      ok($ret, "Custom Field Order created");
  }
  
 -my ($total, @data, @tickets, @test) = (0, ());
 +my (@data, @tickets, @test) = (0, ());
  
 -sub add_tix_from_data {
 -    my @res = ();
 -    @data = sort { rand(100) <=> rand(100) } @data;
 -    while (@data) {
 -        my %args = %{ shift(@data) };
+ 
 -        my @values = ();
 -        if ( exists $args{'CF'} && ref $args{'CF'} ) {
 -            @values = @{ delete $args{'CF'} };
 -        } elsif ( exists $args{'CF'} ) {
 -            @values = (delete $args{'CF'});
 -        }
 -        $args{ 'CustomField-'. $cf->id } = \@values
 -            if @values;
 -
 -        my $subject = join(",", sort @values) || '-';
 -        my $t = RT::Test->create_ticket(
 -            %args,
 -            Queue => $queue->id,
 -            Subject => $subject,
 -        );
 -        push @res, $t;
 -        $total++;
 -    }
 -    return @res;
 -}
+ 
  sub run_tests {
      my $query_prefix = join ' OR ', map 'id = '. $_->id, @tickets;
      foreach my $test ( @test ) {
@@@ -85,11 -112,11 +87,11 @@@
  }
  
  @data = (
 -    { },
 -    { CF => ['b', 'd'] },
 -    { CF => ['a', 'c'] },
 +    { Subject => '-' },
 +    { Subject => 'b-d', 'CustomField-' . $cf->id => ['b', 'd'] },
 +    { Subject => 'a-c', 'CustomField-' . $cf->id => ['a', 'c'] },
  );
- @tickets = create_tickets($queue->id, sort { rand(100) <=> rand(100) } @data);
 - at tickets = add_tix_from_data();
++ at tickets = RT::Test->create_tickets( {Queue => $queue->id, RandomOrder => 1 }, @data);
  @test = (
      { Order => "CF.{$cf_name}" },
      { Order => "CF.$queue_name.{$cf_name}" },
@@@ -97,11 -124,11 +99,11 @@@
  run_tests();
  
  @data = (
 -    { CF => ['m', 'a'] },
 -    { CF => ['m'] },
 -    { CF => ['m', 'o'] },
 +    { Subject => 'm-a', 'CustomField-' . $cf->id => ['m', 'a'] },
 +    { Subject => 'm', 'CustomField-' . $cf->id => ['m'] },
 +    { Subject => 'm-o', 'CustomField-' . $cf->id => ['m', 'o'] },
  );
- @tickets = create_tickets($queue->id, sort { rand(100) <=> rand(100) } @data);
 - at tickets = add_tix_from_data();
++ at tickets = RT::Test->create_tickets( {Queue => $queue->id, RandomORder => 1 }, @data);
  @test = (
      { Order => "CF.{$cf_name}", Query => "CF.{$cf_name} = 'm'" },
      { Order => "CF.$queue_name.{$cf_name}", Query => "CF.{$cf_name} = 'm'" },
diff --cc t/ticket/cfsort-freeform-single.t
index 6c2c03c,dc4da53..e564ac8
--- a/t/ticket/cfsort-freeform-single.t
+++ b/t/ticket/cfsort-freeform-single.t
@@@ -88,12 -119,11 +88,12 @@@ sub run_tests 
  }
  
  @data = (
 -    { },
 -    { CF => 'a' },
 -    { CF => 'b' },
 +    { Subject => '-' },
 +    { Subject => 'a', 'CustomField-' . $CF{CF}{obj}->id => 'a' },
 +    { Subject => 'b', 'CustomField-' . $CF{CF}{obj}->id => 'b' },
  );
 - at tickets = add_tix_from_data();
 +
- @tickets = create_tickets($queue->id, sort { rand(100) <=> rand(100) } @data);
++ at tickets = RT::Test->create_tickets( { Queue => $queue->id, RandomOrder => 1 }, @data);
  @test = (
      { Order => "CF.{$cf_name}" },
      { Order => "CF.$queue_name.{$cf_name}" },
@@@ -101,11 -131,11 +101,11 @@@
  run_tests();
  
  @data = (
 -    { },
 -    { CF => 'aa' },
 -    { CF => 'ab' },
 +    { Subject => '-' },
 +    { Subject => 'aa', 'CustomField-' . $CF{CF}{obj}->id => 'aa' },
 +    { Subject => 'bb', 'CustomField-' . $CF{CF}{obj}->id => 'bb' },
  );
- @tickets = create_tickets($queue->id, sort { rand(100) <=> rand(100) } @data);
 - at tickets = add_tix_from_data();
++ at tickets = RT::Test->create_tickets( { Queue => $queue->id, RandomOrder => 1 }, @data);
  @test = (
      { Query => "CF.{$cf_name} LIKE 'a'", Order => "CF.{$cf_name}" },
      { Query => "CF.{$cf_name} LIKE 'a'", Order => "CF.$queue_name.{$cf_name}" },
@@@ -118,7 -148,7 +118,7 @@@ run_tests()
      { Subject => 'b', CF => 'b' },
      { Subject => 'c', CF => 'c' },
  );
- @tickets = create_tickets($queue->id, sort { rand(100) <=> rand(100) } @data);
 - at tickets = add_tix_from_data();
++ at tickets = RT::Test->create_tickets( { Queue => $queue->id, RandomOrder => 1 }, @data);
  @test = (
      { Query => "CF.{$cf_name} != 'c'", Order => "CF.{$cf_name}" },
      { Query => "CF.{$cf_name} != 'c'", Order => "CF.$queue_name.{$cf_name}" },
@@@ -146,7 -176,7 +146,7 @@@ diag "create another CF"
      { Subject => 'b', CF => 'b', AnotherCF => 'ya' },
      { Subject => 'c', CF => 'c', AnotherCF => 'xa' },
  );
- @tickets = create_tickets($queue->id, sort { rand(100) <=> rand(100) } @data);
 - at tickets = add_tix_from_data();
++ at tickets = RT::Test->create_tickets( { Queue => $queue->id, RandomOrder => 1 }, @data);
  @test = (
      { Order => "CF.{$cf_name}" },
      { Order => "CF.$queue_name.{$cf_name}" },
diff --cc t/ticket/search_by_cf_freeform_multiple.t
index 194b493,41e4ecc..7d5dc94
--- a/t/ticket/search_by_cf_freeform_multiple.t
+++ b/t/ticket/search_by_cf_freeform_multiple.t
@@@ -114,9 -140,7 +114,9 @@@ sub run_tests 
      "'CF.$queue.{$cf_id}' = 'x' OR 'CF.$queue.{$cf_id}' IS NOT NULL"      => { '-' => 0, x => 1, y => 1, z => 1, xy => 1, xz => 1, yz => 1 },
      "'CF.$queue.{$cf_name}' = 'x' OR 'CF.$queue.{$cf_name}' IS NOT NULL"  => { '-' => 0, x => 1, y => 1, z => 1, xy => 1, xz => 1, yz => 1 },
  );
- @tickets = create_tickets($q->id, @data);
 - at tickets = add_tix_from_data();
++ at tickets = RT::Test->create_tickets( { Queue => $queue->id }, @data);
 +$total = scalar @tickets;
 +
  {
      my $tix = RT::Tickets->new(RT->SystemUser);
      $tix->FromSQL("Queue = '$queue'");
diff --cc t/ticket/search_by_cf_freeform_single.t
index e8c5e42,38eab82..1c0bf58
--- a/t/ticket/search_by_cf_freeform_single.t
+++ b/t/ticket/search_by_cf_freeform_single.t
@@@ -112,8 -129,7 +112,8 @@@ sub run_tests 
      "'CF.$queue.{$cf_name}' = 'x' OR 'CF.$queue.{$cf_name}' IS NOT NULL"  => { '-' => 0, x => 1, y => 1, z => 1 },
  
  );
- @tickets = create_tickets($q->id, @data);
 - at tickets = add_tix_from_data();
++ at tickets = RT::Test->create_tickets( { Queue => $queue->id }, @data);
 +$total = scalar @tickets;
  {
      my $tix = RT::Tickets->new(RT->SystemUser);
      $tix->FromSQL("Queue = '$queue'");
diff --cc t/ticket/search_by_watcher.t
index 691fd8e,612b128..4dd98c2
--- a/t/ticket/search_by_watcher.t
+++ b/t/ticket/search_by_watcher.t
@@@ -246,15 -247,19 +245,17 @@@ my $nobody = RT::Nobody()
      my $u = RT::User->new( RT->SystemUser );
      $u->LoadOrCreateByEmail('alpha at e.com');
      ok($u->id, "loaded user");
-     @data = ( { Subject => '4', Owner => $u->id } );
-     my($t) = create_tickets($q->id, @data);
+     my($t) = RT::Test->create_tickets(
+         { Queue => $q->id }, { Subject => '4', Owner => $u->id },
+     );
 -    is( $t->Owner, $u->id, "created ticket with custom owner" );
      my $u_alpha_id = $u->id;
  
      $u = RT::User->new( RT->SystemUser );
      $u->LoadOrCreateByEmail('bravo at e.com');
      ok($u->id, "loaded user");
-     @data = ( { Subject => '5', Owner => $u->id } );
-     ($t) = create_tickets($q->id, @data);
+     ($t) = RT::Test->create_tickets(
+         { Queue => $q->id }, { Subject => '5', Owner => $u->id },
+     );
 -    is( $t->Owner, $u->id, "created ticket with custom owner" );
      my $u_bravo_id = $u->id;
  
      my $tix = RT::Tickets->new(RT->SystemUser);
diff --cc t/ticket/sort-by-user.t
index ca0e085,d98098b..99576c8
--- a/t/ticket/sort-by-user.t
+++ b/t/ticket/sort-by-user.t
@@@ -47,8 -47,32 +47,9 @@@ foreach my $u (qw(Z A)) 
      push @uids, $user->id;
  }
  
 -my ($total, @data, @tickets, @test) = (0, ());
 +my (@data, @tickets, @test) = (0, ());
  
 -sub add_tix_from_data {
 -    my @res = ();
 -    @data = sort { rand(100) <=> rand(100) } @data;
 -    while (@data) {
 -        my %args = %{ shift(@data) };
 -
 -        my $t = RT::Test->create_ticket( %args, Queue => $queue->id );
 -
 -        if ( $args{'Owner'} ) {
 -            is $t->Owner, $args{'Owner'}, "owner is correct";
 -        }
 -        if ( $args{'Creator'} ) {
 -            is $t->Creator, $args{'Creator'}, "creator is correct";
 -        }
 -        # hackish, but simpler
 -        if ( $args{'LastUpdatedBy'} ) {
 -            $t->__Set( Field => 'LastUpdatedBy', Value => $args{'LastUpdatedBy'} );
 -        }
 -        push @res, $t;
 -        $total++;
 -    }
 -    return @res;
 -}
+ 
  sub run_tests {
      my $query_prefix = join ' OR ', map 'id = '. $_->id, @tickets;
      foreach my $test ( @test ) {

commit a6acfaae527542711e852ad8b21e3e3956aed419
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Fri Oct 22 05:25:30 2010 +0400

    merge together two variants of create_tickets in RT::Test
    
    * use class method as it's inheritable and overridable in plugins
    * create_ticket and create_tickets
    * allow to set other defaults for whole set, rather than only queue

diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 1a260b1..4041dce 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -75,7 +75,7 @@ wrap 'HTTP::Request::Common::form_data',
    };
 
 
-our @EXPORT = qw(is_empty diag parse_mail works fails create_tickets);
+our @EXPORT = qw(is_empty diag parse_mail works fails);
 our ($port, $dbname);
 our @SERVERS;
 
@@ -606,10 +606,11 @@ sub create_tickets {
     my $self = shift;
     my $defaults = shift;
     my @data = @_;
-
     @data = sort { rand(100) <=> rand(100) } @data
         if delete $defaults->{'RandomOrder'};
 
+    $defaults->{'Queue'} ||= 'General';
+
     my @res = ();
     while ( @data ) {
         my %args = %{ shift @data };
@@ -634,11 +635,36 @@ sub create_ticket {
         );
     }
 
-    my $t = RT::Ticket->new( RT->SystemUser );
-    my ( $id, undef, $msg ) = $t->Create( %args );
+    my $ticket = RT::Ticket->new( RT->SystemUser );
+    my ( $id, undef, $msg ) = $ticket->Create( %args );
     Test::More::ok( $id, "ticket created" )
         or Test::More::diag("error: $msg");
-    return $t;
+
+    # hackish, but simpler
+    if ( $args{'LastUpdatedBy'} ) {
+        $ticket->__Set( Field => 'LastUpdatedBy', Value => $args{'LastUpdatedBy'} );
+    }
+
+
+    for my $field ( keys %args ) {
+        #TODO check links and watchers
+
+        if ( $field =~ /CustomField-(\d+)/ ) {
+            my $cf = $1;
+            my $got = join ',', sort map $_->Content,
+                @{ $ticket->CustomFieldValues($cf)->ItemsArrayRef };
+            my $expected = ref $args{$field}
+                ? join( ',', sort @{ $args{$field} } )
+                : $args{$field};
+            Test::More::is( $got, $expected, 'correct CF values' );
+        }
+        else {
+            next if ref $args{$field} || !$ticket->can($field) || ref $ticket->$field();
+            Test::More::is( $ticket->$field(), $args{$field}, "$field is correct" );
+        }
+    }
+
+    return $ticket;
 }
 
 =head2 load_or_create_custom_field
@@ -1426,73 +1452,6 @@ sub fails {
     Test::More::ok(!$_[0], $_[1] || 'This should fail');
 }
 
-sub create_tickets {
-    my $default_queue;
-    if ( $_[0] && ( !ref $_[0] || ref $_[0] eq 'RT::Queue' ) ) {
-        $default_queue = shift;
-    }
-    else {
-        $default_queue = 'General';
-    }
-
-    my @res;
-
-    while (my $data = shift @_) {
-        my $ticket = RT::Ticket->new(RT->SystemUser);
-        my %args = %$data;
-        my %links;
-
-        # link tickets
-        for my $type ( keys %RT::Ticket::LINKTYPEMAP ) {
-            my $index = delete $args{$type};
-            next unless defined $index;
-            $links{$type} = $res[ $index ]->id;
-        }
-
-        my ( $id, undef, $msg ) = $ticket->Create(
-            Queue => $default_queue,
-            %args,
-            %links,
-        );
-
-        # hackish, but simpler
-        if ( $args{'LastUpdatedBy'} ) {
-            $ticket->__Set( Field => 'LastUpdatedBy', Value => $args{'LastUpdatedBy'} );
-        }
-
-        Test::More::ok( $id, "ticket created" ) or diag("error: $msg");
-
-        for my $field ( keys %args ) {
-            #TODO check links and watchers
-
-            if ( $field =~ /CustomField-(\d+)/ ) {
-                my $cf = $1;
-                my $got = join ',', do {
-                    my $vals = $ticket->CustomFieldValues($cf);
-                    $vals->OrderBy( Field => 'id', ORDER => 'ASC' );
-                    my @tmp;
-                    while ( my $v = $vals->Next ) { push @tmp, $v->Content }
-                    @tmp;
-                };
-        
-                Test::More::is(
-                    $got,
-                    ref $args{$field}
-                    ? join( ',', @{ $args{$field} } )
-                    : $args{$field},
-                    'correct CF values'
-                );
-            }
-            else {
-                next unless !ref $args{$field} && $ticket->can($field);
-                Test::More::is( $ticket->$field, $args{$field}, "$field is correct" );
-            }
-        }
-        push @res, $ticket;
-    }
-    return @res;
-}
-
 END {
     my $Test = RT::Test->builder;
     return if $Test->{Original_Pid} != $$;

commit 51b6d6be6745600b91b68d1bbdfcb538cf0a8e6c
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Fri Oct 22 05:28:51 2010 +0400

    fix issues related to RT::Test->create_tickets merge

diff --git a/t/fts/indexed_oracle.t b/t/fts/indexed_oracle.t
index 5179d2a..3c943f2 100644
--- a/t/fts/indexed_oracle.t
+++ b/t/fts/indexed_oracle.t
@@ -5,7 +5,7 @@ use warnings;
 
 use RT::Test tests => undef;
 plan skip_all => 'Not Oracle' unless RT->Config->Get('DatabaseType') eq 'Oracle';
-plan tests => 9;
+plan tests => 11;
 
 RT->Config->Set( FullTextSearch => Enable => 1, Indexed => 1 );
 
diff --git a/t/fts/indexed_pg.t b/t/fts/indexed_pg.t
index d23a16a..355d165 100644
--- a/t/fts/indexed_pg.t
+++ b/t/fts/indexed_pg.t
@@ -5,7 +5,7 @@ use warnings;
 
 use RT::Test tests => undef;
 plan skip_all => 'Not Pg' unless RT->Config->Get('DatabaseType') eq 'Pg';
-plan tests => 9;
+plan tests => 11;
 
 RT->Config->Set( FullTextSearch => Enable => 1, Indexed => 1 );
 
diff --git a/t/ticket/search_by_cf_freeform_multiple.t b/t/ticket/search_by_cf_freeform_multiple.t
index 7d5dc94..e102720 100644
--- a/t/ticket/search_by_cf_freeform_multiple.t
+++ b/t/ticket/search_by_cf_freeform_multiple.t
@@ -114,7 +114,7 @@ sub run_tests {
     "'CF.$queue.{$cf_id}' = 'x' OR 'CF.$queue.{$cf_id}' IS NOT NULL"      => { '-' => 0, x => 1, y => 1, z => 1, xy => 1, xz => 1, yz => 1 },
     "'CF.$queue.{$cf_name}' = 'x' OR 'CF.$queue.{$cf_name}' IS NOT NULL"  => { '-' => 0, x => 1, y => 1, z => 1, xy => 1, xz => 1, yz => 1 },
 );
- at tickets = RT::Test->create_tickets( { Queue => $queue->id }, @data);
+ at tickets = RT::Test->create_tickets( { Queue => $q->id }, @data);
 $total = scalar @tickets;
 
 {
diff --git a/t/ticket/search_by_cf_freeform_single.t b/t/ticket/search_by_cf_freeform_single.t
index 1c0bf58..19e0b86 100644
--- a/t/ticket/search_by_cf_freeform_single.t
+++ b/t/ticket/search_by_cf_freeform_single.t
@@ -112,7 +112,7 @@ sub run_tests {
     "'CF.$queue.{$cf_name}' = 'x' OR 'CF.$queue.{$cf_name}' IS NOT NULL"  => { '-' => 0, x => 1, y => 1, z => 1 },
 
 );
- at tickets = RT::Test->create_tickets( { Queue => $queue->id }, @data);
+ at tickets = RT::Test->create_tickets( { Queue => $q->id }, @data);
 $total = scalar @tickets;
 {
     my $tix = RT::Tickets->new(RT->SystemUser);
diff --git a/t/ticket/sort-by-user.t b/t/ticket/sort-by-user.t
index 99576c8..c504ea2 100644
--- a/t/ticket/sort-by-user.t
+++ b/t/ticket/sort-by-user.t
@@ -99,7 +99,7 @@ sub run_tests {
     { Subject => 'A', Owner => $uids[1] },
 );
 
- at tickets = create_tickets( $queue->id, @data );
+ at tickets = RT::Test->create_tickets( { Queue => $queue->id }, @data );
 
 @test = (
     { Order => "Owner" },
@@ -111,7 +111,7 @@ run_tests();
     { Subject => 'Z', Creator => $uids[0] },
     { Subject => 'A', Creator => $uids[1] },
 );
- at tickets = create_tickets( $queue->id, @data );
+ at tickets = RT::Test->create_tickets( { Queue => $queue->id }, @data );
 @test = (
     { Order => "Creator" },
 );
@@ -122,7 +122,7 @@ run_tests();
     { Subject => 'Z', LastUpdatedBy => $uids[0] },
     { Subject => 'A', LastUpdatedBy => $uids[1] },
 );
- at tickets = create_tickets( $queue->id, @data );
+ at tickets = RT::Test->create_tickets( { Queue => $queue->id }, @data );
 @test = (
     { Order => "LastUpdatedBy" },
 );

-----------------------------------------------------------------------


More information about the Rt-commit mailing list