X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMooseX-Getopt.git;a=blobdiff_plain;f=t%2F008_configfromfile.t;fp=t%2F008_configfromfile.t;h=5d3b03d83ba605495f4b85622e2ac2475cca1c43;hp=3e420ac610b7c0c6997b75f4a3fbd96b95012eb6;hb=f085ee4d571b470f4dc4874dfaae7f2f542d6eba;hpb=afa8f0e64427bf3571b98614b54a1d2dd88eb157

diff --git a/t/008_configfromfile.t b/t/008_configfromfile.t
index 3e420ac..5d3b03d 100644
--- a/t/008_configfromfile.t
+++ b/t/008_configfromfile.t
@@ -93,7 +93,7 @@ my %constructor_args;
     use Moose;
     extends 'App';
 
-    around configfile => sub { '/notused/default' };
+    sub _get_default_configfile { '/notused/default' }
 }
 
 
@@ -146,7 +146,11 @@ my %constructor_args;
         );
     }
 
-    {
+    SKIP: {
+        eval "use MooseX::ConfigFromFile 0.08 (); 1;";
+        diag("MooseX::ConfigFromFile 0.08 needed to test this use of configfile defaults"),
+        skip "MooseX::ConfigFromFile 0.08 needed to test this use of configfile defaults", 7 if $@;
+
         my $app = App::ConfigFileWrapped->new_with_options;
         isa_ok( $app, 'App::ConfigFileWrapped' );
         app_ok( $app );
@@ -215,7 +219,7 @@ my %constructor_args;
             'correct constructor args passed',
         );
     }
-    TODO: {
+    {
         my $app = App::ConfigFileWrapped->new_with_options;
         isa_ok( $app, 'App::ConfigFileWrapped' );
         app_ok( $app );
@@ -223,10 +227,6 @@ my %constructor_args;
         ok( $app->config_from_override,
              '... config_from_override true as expected' );
 
-# FIXME - in order for this to work, we need to fix CFF so the
-# configfile method always returns the actual value of the attribute,
-# not the default sub thingy.
-        local $TODO = 'MooseX::ConfigFromFile needs fixes';
         is( $app->configfile, path('/notused/override'),
             '... configfile is /notused as expected' );