Trailing WS crusade - got to save them bits

[dbsrgits/DBIx-Class.git] / xt / eol.t

diff --git a/xt/eol.t b/xt/eol.t
index 609f6ad..a3d7d86 100644 (file)
--- a/xt/eol.t
+++ b/xt/eol.t
@@ -5,28 +5,19 @@ use Test::More;
 use lib 't/lib';
 use DBICTest;
 
-# Don't run tests for installs
-unless ( DBICTest::AuthorCheck->is_author || $ENV{AUTOMATED_TESTING} || $ENV{RELEASE_TESTING} ) {
-  plan( skip_all => "Author tests not required for installation" );
-}
-
-plan skip_all => 'Test::EOL very broken';
-
 require DBIx::Class;
 unless ( DBIx::Class::Optional::Dependencies->req_ok_for ('test_eol') ) {
   my $missing = DBIx::Class::Optional::Dependencies->req_missing_for ('test_eol');
-  $ENV{RELEASE_TESTING} || DBICTest::AuthorCheck->is_author
+  (! DBICTest::RunMode->is_plain && ! DBICTest::RunMode->is_smoker )
     ? die ("Failed to load release-testing module requirements: $missing")
     : plan skip_all => "Test needs: $missing"
 }
 
-TODO: {
-  local $TODO = 'Do not fix those yet - we have way too many branches out there, merging will be hell';
-  Test::EOL::all_perl_files_ok({ trailing_whitespace => 1},
-    qw/t xt lib script/,
-    DBICTest::AuthorCheck->is_author ? ('maint') : (),
-  );
-}
+Test::EOL::all_perl_files_ok({ trailing_whitespace => 1 },
+  qw/t xt lib script/,
+  DBICTest::RunMode->is_author ? ('maint') : (),
+);
 
-# FIXME - need to fix Test::EOL
+# FIXME - Test::EOL declares 'no_plan' which conflicts with done_testing
+# https://github.com/schwern/test-more/issues/14
 #done_testing;