Really fix @INC munging of the taint test

[dbsrgits/DBIx-Class.git] / t / 103many_to_many_warning.t

diff --git a/t/103many_to_many_warning.t b/t/103many_to_many_warning.t
index 06ac61e..2c42091 100644 (file)
--- a/t/103many_to_many_warning.t
+++ b/t/103many_to_many_warning.t
@@ -3,34 +3,35 @@ use warnings;
 use Test::More;
 
 use lib qw(t/lib);
-use Data::Dumper;
+use DBICTest;
 
-plan tests => 4;
 my $exp_warn = qr/The many-to-many relationship 'bars' is trying to create/;
 
 {
-  my @w; 
+  my @w;
   local $SIG{__WARN__} = sub { $_[0] =~ $exp_warn ? push @w, $_[0] : warn $_[0] };
   my $code = gen_code ( suffix => 1 );
+
+  local $ENV{DBIC_OVERWRITE_HELPER_METHODS_OK};
   eval "$code";
   ok (! $@, 'Eval code without warnings suppression')
     || diag $@;
 
-  ok (@w, "Warning triggered without DBIC_METHOD_CLOBBER_OK");
+  ok (@w, "Warning triggered without DBIC_OVERWRITE_HELPER_METHODS_OK");
 }
 
 {
-  my @w; 
+  my @w;
   local $SIG{__WARN__} = sub { $_[0] =~ $exp_warn ? push @w, $_[0] : warn $_[0] };
 
   my $code = gen_code ( suffix => 2 );
 
-  local $ENV{DBIC_METHOD_CLOBBER_OK} = 1;
+  local $ENV{DBIC_OVERWRITE_HELPER_METHODS_OK} = 1;
   eval "$code";
   ok (! $@, 'Eval code with warnings suppression')
     || diag $@;
 
-  ok (! @w, "No warning triggered with DBIC_METHOD_CLOBBER_OK");
+  ok (! @w, "No warning triggered with DBIC_OVERWRITE_HELPER_METHODS_OK");
 }
 
 sub gen_code {
@@ -101,3 +102,5 @@ use warnings;
 EOF
 
 }
+
+done_testing;