X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F008_configfromfile.t;h=62e6ed9dea92f4c5617306c3782695fdca5643be;hb=refs%2Fheads%2Ftopic%2Fconfigfile_default_codref_call;hp=4b78e512387bdaeba544754d9228d9a2c533adaf;hpb=62c4891a67e6c7f3a79eb48adec1bf3eca3ff4d1;p=gitmo%2FMooseX-Getopt.git

diff --git a/t/008_configfromfile.t b/t/008_configfromfile.t
index 4b78e51..62e6ed9 100644
--- a/t/008_configfromfile.t
+++ b/t/008_configfromfile.t
@@ -5,14 +5,15 @@ use warnings;
 
 use Test::Exception;
 use Test::More;
+use File::Spec;
 
-if ( !require MooseX::ConfigFromFile )
+if ( !eval { require MooseX::ConfigFromFile } )
 {
     plan skip_all => 'Test requires MooseX::ConfigFromFile';
 }
 else
 {
-    plan tests => 24;
+    plan tests => 37;
 }
 
 {
@@ -55,7 +56,8 @@ else
             optional_from_config => 'from_config_2',
         );
 
-        if ( $file ne '/notused/default' ) {
+        my $cpath = File::Spec->canonpath('/notused/default');
+        if ( $file ne $cpath ) {
             $config{config_from_override} = 1;
         }
 
@@ -70,7 +72,18 @@ else
     extends 'App';
 
     has '+configfile' => (
-        default => '/notused/default',
+        default => File::Spec->canonpath('/notused/default'),
+    );
+}
+
+{
+    package App::DefaultConfigFileCodeRef;
+
+    use Moose;
+    extends 'App';
+
+    has '+configfile' => (
+        default => sub { return File::Spec->canonpath('/notused/default') },
     );
 }
 
@@ -80,18 +93,32 @@ else
 
     throws_ok { App->new_with_options } qr/Required option missing: required_from_config/;
 
+    {
+        my $app = App::DefaultConfigFile->new_with_options;
+        isa_ok( $app, 'App::DefaultConfigFile' );
+        app_ok( $app );
 
-    TODO: {
-        local $TODO = 'Cannot supply required args from config';
+        ok(  !$app->config_from_override,
+            '... config_from_override false as expected' );
 
-        my $app = eval { App::DefaultConfigFile->new_with_options };
-        isa_ok( $app, 'App::DefaultConfigFile' );
+        is( $app->configfile, File::Spec->canonpath('/notused/default'),
+            '... configfile is /notused/default as expected' );
+    }
+}
+
+# No config specified
+{
+    local @ARGV = qw( --required_from_argv 1 );
+
+    {
+        my $app = App::DefaultConfigFileCodeRef->new_with_options;
+        isa_ok( $app, 'App::DefaultConfigFileCodeRef' );
         app_ok( $app );
 
-        ok( $app && !$app->config_from_override,
+        ok(  !$app->config_from_override,
             '... config_from_override false as expected' );
 
-        is( $app && $app->configfile, '/notused/default',
+        is( $app->configfile, File::Spec->canonpath('/notused/default'),
             '... configfile is /notused/default as expected' );
     }
 }
@@ -100,25 +127,32 @@ else
 {
     local @ARGV = qw( --configfile /notused --required_from_argv 1 );
 
-    TODO: {
-        local $TODO = 'Cannot supply required args from config';
-
-        my $app = eval { App->new_with_options };
+    {
+        my $app = App->new_with_options;
         isa_ok( $app, 'App' );
         app_ok( $app );
     }
 
-    TODO: {
-        local $TODO = 'Cannot supply required args from config';
-
-        my $app = eval { App::DefaultConfigFile->new_with_options };
+    {
+        my $app = App::DefaultConfigFile->new_with_options;
         isa_ok( $app, 'App::DefaultConfigFile' );
         app_ok( $app );
 
-        is ( $app && $app->config_from_override,
+        ok( $app->config_from_override,
+             '... config_from_override true as expected' );
+
+        is( $app->configfile, File::Spec->canonpath('/notused'),
+            '... configfile is /notused as expected' );
+    }
+    {
+        my $app = App::DefaultConfigFileCodeRef->new_with_options;
+        isa_ok( $app, 'App::DefaultConfigFileCodeRef' );
+        app_ok( $app );
+
+        ok( $app->config_from_override,
              '... config_from_override true as expected' );
 
-        is( $app && $app->configfile, '/notused',
+        is( $app->configfile, File::Spec->canonpath('/notused'),
             '... configfile is /notused as expected' );
     }
 }
@@ -157,15 +191,36 @@ else
         '... optional_from_config is undef as expected' );
 }
 
+{
+    package BaseApp::WithConfig;
+    use Moose;
+    with 'MooseX::ConfigFromFile';
+
+    sub get_config_from_file { return {}; }
+}
+
+{
+    package DerivedApp::Getopt;
+    use Moose;
+    extends 'BaseApp::WithConfig';
+    with 'MooseX::Getopt';
+}
+
+# With DerivedApp, the Getopt role was applied at a different level
+# than the ConfigFromFile role
+{
+    lives_ok { DerivedApp::Getopt->new_with_options } 'Can create DerivedApp';
+}
+
 sub app_ok {
     my $app = shift;
 
-    is( $app && $app->required_from_config, 'from_config_1',
+    is( $app->required_from_config, 'from_config_1',
         '... required_from_config is from_config_1 as expected' );
 
-    is( $app && $app->optional_from_config, 'from_config_2',
+    is( $app->optional_from_config, 'from_config_2',
         '... optional_from_config is from_config_2 as expected' );
 
-    is( $app && $app->required_from_argv, '1',
+    is( $app->required_from_argv, '1',
         '... required_from_argv is 1 as expected' );
 }