X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F008_configfromfile.t;h=e228d35a8d9206324ced5efdb0afce5e4ae5e8b9;hb=c6858912da6e23461db6e38193a39daa8eb85db5;hp=44b20fe14204e9fff3b2a0ea783e1b245add86ac;hpb=9fbb5be9dcf64475fb6f4d25807db1e952be2365;p=gitmo%2FMooseX-Getopt.git

diff --git a/t/008_configfromfile.t b/t/008_configfromfile.t
index 44b20fe..e228d35 100644
--- a/t/008_configfromfile.t
+++ b/t/008_configfromfile.t
@@ -1,15 +1,12 @@
 use strict;
 use warnings;
 
+use Test::Requires { 'MooseX::ConfigFromFile' => '0.06' };    # skip all if not installed
 use Test::More tests => 38;
 use Test::Fatal;
-use File::Spec;
+use Path::Tiny;
 use Test::NoWarnings 1.04 ':early';
 
-use Test::Requires {
-    'MooseX::ConfigFromFile' => 0.01, # skip all if not installed
-};
-
 {
     package App;
 
@@ -50,7 +47,7 @@ use Test::Requires {
             optional_from_config => 'from_config_2',
         );
 
-        my $cpath = File::Spec->canonpath('/notused/default');
+        my $cpath = Path::Tiny::path('/notused/default');
         if ( $file ne $cpath ) {
             $config{config_from_override} = 1;
         }
@@ -66,7 +63,7 @@ use Test::Requires {
     extends 'App';
 
     has '+configfile' => (
-        default => File::Spec->canonpath('/notused/default'),
+        default => Path::Tiny::path('/notused/default')->stringify,
     );
 }
 
@@ -77,7 +74,7 @@ use Test::Requires {
     extends 'App';
 
     has '+configfile' => (
-        default => sub { return File::Spec->canonpath('/notused/default') },
+        default => sub { return Path::Tiny::path('/notused/default') },
     );
 }
 
@@ -85,12 +82,10 @@ use Test::Requires {
 {
     local @ARGV = qw( --required_from_argv 1 );
 
-    if ($Getopt::Long::Descriptive::VERSION >= 0.091) {
-        like exception { App->new_with_options }, qr/Mandatory parameter 'required_from_config' missing/;
-    }
-    else {
-        like exception { App->new_with_options }, qr/Required option missing: required_from_config/;
-    }
+    like exception { App->new_with_options },
+        ($Getopt::Long::Descriptive::VERSION >= 0.091
+            ? qr/Mandatory parameter 'required_from_config' missing/
+            : qr/Required option missing: required_from_config/);
 
     {
         my $app = App::DefaultConfigFile->new_with_options;
@@ -100,14 +95,9 @@ use Test::Requires {
         ok(  !$app->config_from_override,
             '... config_from_override false as expected' );
 
-        is( $app->configfile, File::Spec->canonpath('/notused/default'),
+        is( $app->configfile, path('/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;
@@ -117,14 +107,14 @@ use Test::Requires {
         ok(  !$app->config_from_override,
             '... config_from_override false as expected' );
 
-        is( $app->configfile, File::Spec->canonpath('/notused/default'),
+        is( $app->configfile, path('/notused/default'),
             '... configfile is /notused/default as expected' );
     }
 }
 
 # Config specified
 {
-    local @ARGV = qw( --configfile /notused --required_from_argv 1 );
+    local @ARGV = qw( --configfile /notused/override --required_from_argv 1 );
 
     {
         my $app = App->new_with_options;
@@ -140,8 +130,8 @@ use Test::Requires {
         ok( $app->config_from_override,
              '... config_from_override true as expected' );
 
-        is( $app->configfile, File::Spec->canonpath('/notused'),
-            '... configfile is /notused as expected' );
+        is( $app->configfile, path('/notused/override'),
+            '... configfile is /notused/override as expected' );
     }
     {
         my $app = App::DefaultConfigFileCodeRef->new_with_options;
@@ -151,25 +141,23 @@ use Test::Requires {
         ok( $app->config_from_override,
              '... config_from_override true as expected' );
 
-        is( $app->configfile, File::Spec->canonpath('/notused'),
+        is( $app->configfile, path('/notused'),
             '... configfile is /notused as expected' );
     }
 }
 
 # Required arg not supplied from cmdline
 {
-    local @ARGV = qw( --configfile /notused );
-    if ($Getopt::Long::Descriptive::VERSION >= 0.091) {
-        like exception { App->new_with_options }, qr/Mandatory parameter 'required_from_argv' missing/;
-    }
-    else {
-        like exception { App->new_with_options }, qr/Required option missing: required_from_argv/;
-    }
+    local @ARGV = qw( --configfile /notused/override );
+    like exception { App->new_with_options },
+        ($Getopt::Long::Descriptive::VERSION >= 0.091
+            ? qr/Mandatory parameter 'required_from_argv' missing/
+            : qr/Required option missing: required_from_argv/);
 }
 
 # Config file value overriden from cmdline
 {
-    local @ARGV = qw( --configfile /notused --required_from_argv 1 --required_from_config override );
+    local @ARGV = qw( --configfile /notused/override --required_from_argv 1 --required_from_config override );
 
     my $app = App->new_with_options;
     isa_ok( $app, 'App' );