X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F008_configfromfile.t;h=9373d0f3f72abcdfd48c036b735e9f3be1c213c5;hb=11417a07c5fd2029f4d6af70a44ff698aef07ad5;hp=d24296ed5c7c54dc18f591a366f11d18609079fe;hpb=498f0ffcc48ae8bbd7a3f7a1c5777c1d9c85e5fe;p=gitmo%2FMooseX-Getopt.git

diff --git a/t/008_configfromfile.t b/t/008_configfromfile.t
index d24296e..9373d0f 100644
--- a/t/008_configfromfile.t
+++ b/t/008_configfromfile.t
@@ -1,13 +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';
-
 {
     package App;
 
@@ -48,7 +47,7 @@ use Test::Requires 'MooseX::ConfigFromFile';
             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;
         }
@@ -64,7 +63,7 @@ use Test::Requires 'MooseX::ConfigFromFile';
     extends 'App';
 
     has '+configfile' => (
-        default => File::Spec->canonpath('/notused/default'),
+        default => Path::Tiny::path('/notused/default')->stringify,
     );
 }
 
@@ -75,7 +74,7 @@ use Test::Requires 'MooseX::ConfigFromFile';
     extends 'App';
 
     has '+configfile' => (
-        default => sub { return File::Spec->canonpath('/notused/default') },
+        default => sub { return Path::Tiny::path('/notused/default') },
     );
 }
 
@@ -83,12 +82,10 @@ use Test::Requires 'MooseX::ConfigFromFile';
 {
     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;
@@ -98,7 +95,7 @@ use Test::Requires 'MooseX::ConfigFromFile';
         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' );
     }
 }
@@ -115,7 +112,7 @@ use Test::Requires 'MooseX::ConfigFromFile';
         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' );
     }
 }
@@ -138,7 +135,7 @@ use Test::Requires 'MooseX::ConfigFromFile';
         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' );
     }
     {
@@ -149,7 +146,7 @@ use Test::Requires 'MooseX::ConfigFromFile';
         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' );
     }
 }
@@ -157,12 +154,10 @@ use Test::Requires 'MooseX::ConfigFromFile';
 # 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/;
-    }
+    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