[Rt-commit] rt branch, 4.4/external-storage, updated. rt-4.2.11-39-g59f2652

[Shawn Moore]

The branch, 4.4/external-storage has been updated
       via  59f2652347edbc789665e4dc0a9af403d88fc059 (commit)
      from  fe32673b48223d61241f61a7b7873d2e65984d53 (commit)

Summary of changes:
 lib/RT/ExternalStorage/Test.pm.in                  | 98 ----------------------
 .../SetPriority.pm => Test/ExternalStorage.pm}     | 35 ++++----
 t/externalstorage/basic.t                          |  2 +-
 3 files changed, 16 insertions(+), 119 deletions(-)
 delete mode 100644 lib/RT/ExternalStorage/Test.pm.in
 copy lib/RT/{Action/SetPriority.pm => Test/ExternalStorage.pm} (80%)

- Log -----------------------------------------------------------------
commit 59f2652347edbc789665e4dc0a9af403d88fc059
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Fri May 22 19:03:08 2015 +0000

    Fix externalstorage tests to be more like core RT

diff --git a/lib/RT/ExternalStorage/Test.pm.in b/lib/RT/Test/ExternalStorage.pm
similarity index 78%
rename from lib/RT/ExternalStorage/Test.pm.in
rename to lib/RT/Test/ExternalStorage.pm
index 7e5fbb3..dee8440 100644
--- a/lib/RT/ExternalStorage/Test.pm.in
+++ b/lib/RT/Test/ExternalStorage.pm
@@ -46,41 +46,13 @@
 #
 # END BPS TAGGED BLOCK }}}
 
+package RT::Test::ExternalStorage;
 use strict;
 use warnings;
-
-### after: use lib qw(@RT_LIB_PATH@);
-use lib qw(/opt/rt4/local/lib /opt/rt4/lib);
-
-package RT::ExternalStorage::Test;
-
-=head2 RT::ExternalStorage::Test
-
-Initialization for testing.
-
-=cut
-
 use base qw(RT::Test);
 use File::Spec;
 use File::Path 'mkpath';
 
-sub import {
-    my $class = shift;
-    my %args  = @_;
-
-    $args{'requires'} ||= [];
-    if ( $args{'testing'} ) {
-        unshift @{ $args{'requires'} }, 'RT::ExternalStorage';
-    } else {
-        $args{'testing'} = 'RT::ExternalStorage';
-    }
-
-    $class->SUPER::import( %args );
-    $class->export_to_level(1);
-
-    require RT::ExternalStorage;
-}
-
 sub attachments_dir {
     my $dir = File::Spec->catdir( RT::Test->temp_directory, qw(attachments) );
     mkpath($dir);
@@ -89,10 +61,13 @@ sub attachments_dir {
 
 sub bootstrap_more_config {
     my $self = shift;
-    my ($config) = @_;
+    my $handle = shift;
+    my $args = shift;
+
+    $self->SUPER::bootstrap_more_config($handle, $args, @_);
 
     my $dir = $self->attachments_dir;
-    print $config qq|Set( %ExternalStorage, Type => 'Disk', Path => '$dir' );\n|;
+    print $handle qq|Set( %ExternalStorage, Type => 'Disk', Path => '$dir' );\n|;
 }
 
 1;
diff --git a/t/externalstorage/basic.t b/t/externalstorage/basic.t
index 578c6e2..3a20b21 100644
--- a/t/externalstorage/basic.t
+++ b/t/externalstorage/basic.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use RT::ExternalStorage::Test tests => undef;
+use RT::Test::ExternalStorage tests => undef;
 
 my $queue = RT::Test->load_or_create_queue(Name => 'General');
 ok $queue && $queue->id;

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