X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fadmin%2F03data.t;h=4be2960cd8269a57f41c71fe4aff8a38cb44a9a1;hb=5e0eea35;hp=05ae0090ad85ecd59a1e7a364a79bbc8802c884d;hpb=8273e845426f0187b4ad6c4a1b42286fa09a648f;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/t/admin/03data.t b/t/admin/03data.t
index 05ae009..4be2960 100644
--- a/t/admin/03data.t
+++ b/t/admin/03data.t
@@ -1,20 +1,16 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+use DBIx::Class::Optional::Dependencies -skip_all_without => 'admin';
+
 use strict;
 use warnings;
 
 use Test::More;
 use Test::Exception;
 
-use lib 't/lib';
-use DBICTest;
-
-BEGIN {
-    require DBIx::Class;
-    plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for('admin')
-      unless DBIx::Class::Optional::Dependencies->req_ok_for('admin');
-}
 
-use_ok 'DBIx::Class::Admin';
+use DBICTest;
 
+use DBIx::Class::Admin;
 
 { # test data maniplulation functions
 
@@ -23,9 +19,13 @@ use_ok 'DBIx::Class::Admin';
     sqlite_use_file => 1,
   );
 
+  my $storage = $schema->storage;
+  $storage = $storage->master
+    if $storage->isa('DBIx::Class::Storage::DBI::Replicated');
+
   my $admin = DBIx::Class::Admin->new(
     schema_class=> "DBICTest::Schema",
-    connect_info => $schema->storage->connect_info(),
+    connect_info => $storage->connect_info(),
     quiet  => 1,
     _confirm=>1,
   );
@@ -51,7 +51,7 @@ use_ok 'DBIx::Class::Admin';
     [2,2,undef,undef,undef,'Aran',undef]
   ];
   my $data;
-  lives_ok { $data = $admin->select('Employee')} 'can retrive data from database';
+  lives_ok { $data = $admin->select('Employee', undef, { order_by => 'employee_id' })} 'can retrive data from database';
   is_deeply($data, $expected_data, 'DB matches whats expected');
 
   $admin->delete('Employee', {name=>'Trout'});