From: Graham Knop Date: Mon, 13 Feb 2017 05:41:54 +0000 (-0500) Subject: convert to Distar X-Git-Tag: 5.90116~5^2~1 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=807303a1658f895c41417beba24d24ff9b71c194;hp=b62c4f8b4b612b159ff6e02e350a818f6c6ee5c3 convert to Distar --- diff --git a/.gitignore b/.gitignore index 3fa8dde..95e3522 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,22 @@ -.* -!.gitignore -/Makefile* -!Makefile.PL -/MYMETA.* +/MANIFEST +/MANIFEST.bak +/MANIFEST.SKIP /META.* +/MYMETA.* +/Makefile +/Makefile.old +/README /blib/ -/build/ -/inc/ /pm_to_blib -/MANIFEST* -!MANIFEST.SKIP +/Distar /Debian* -#README -/Catalyst-Runtime-* +*~ +*# +.#* *.bs -/t/tmp +/Catalyst-Runtime-*/ +/Catalyst-Runtime-*.tar.gz +/cover_db/ +/_eumm/ +/t/tmp/ +/.aggregating diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP deleted file mode 100644 index 90b0676..0000000 --- a/MANIFEST.SKIP +++ /dev/null @@ -1,2 +0,0 @@ -^(?!script/\w+\.pl$|TODO$|lib/.+(? 'Catalyst-Runtime', + license => 'perl_5', + prereqs => { + configure => { requires => { + 'ExtUtils::MakeMaker' => 0, + } }, + build => { requires => { + } }, + test => { + requires => { + 'Test::Fatal' => 0, + 'Test::More' => '0.88', + 'HTTP::Request::Common' => 0, + 'IO::Scalar' => 0, + 'HTTP::Status' => 0, + }, + }, + runtime => { + requires => { + 'perl' => 5.008003, + 'List::Util' => '1.45', + 'namespace::autoclean' => '0.28', + 'namespace::clean' => '0.23', + 'MooseX::Emulate::Class::Accessor::Fast' => '0.00903', + 'Class::Load' => '0.12', + 'Data::OptList' => 0, + 'Moose' => '1.03', + 'MooseX::MethodAttributes::Role::AttrContainer::Inheritable' => '0.24', + 'MooseX::Role::WithOverloading' => '0.09', + 'Carp' => '1.25', + 'Class::C3::Adopt::NEXT' => '0.07', + 'CGI::Simple::Cookie' => '1.109', + 'Data::Dump' => 0, + 'Data::OptList' => 0, + 'HTML::Entities' => 0, + 'HTML::HeadParser' => 0, + 'HTTP::Body' => '1.22', + 'HTTP::Headers' => '1.64', + 'HTTP::Request' => '5.814', + 'HTTP::Response' => '5.813', + 'HTTP::Request::AsCGI' => '1.0', + 'Module::Pluggable' => '4.7', + 'Path::Class' => '0.09', + 'Scalar::Util' => 0, + 'Sub::Exporter' => 0, + 'Text::SimpleTable' => '0.03', + 'Time::HiRes' => 0, + 'Tree::Simple' => '1.15', + 'Tree::Simple::Visitor::FindByPath' => 0, + 'Try::Tiny' => '0.17', + 'Safe::Isa' => 0, + 'Task::Weaken' => 0, + 'Text::Balanced' => 0, # core in 5.8.x but mentioned for completeness + 'MRO::Compat' => 0, + 'MooseX::Getopt' => '0.48', + 'String::RewritePrefix' => '0.004', # Catalyst::Utils::resolve_namespace + 'Devel::InnerPackage' => 0, # No longer core in blead + 'Plack' => '0.9991', # IIS6+7 fix middleware + 'Plack::Middleware::ReverseProxy' => '0.04', + 'Plack::Test::ExternalServer' => 0, + 'Class::Data::Inheritable' => 0, + 'Encode' => '2.49', + 'LWP' => '5.837', # LWP had unicode fail in 5.8.26 + 'URI' => '1.65', + 'URI::ws' => '0.03', + 'JSON::MaybeXS' => '1.000000', + 'Stream::Buffered' => 0, + 'Hash::MultiValue' => 0, + 'Plack::Request::Upload' => 0, + 'CGI::Struct' => 0, + "Plack::Middleware::Conditional" => 0, + "Plack::Middleware::IIS6ScriptNameFix" => 0, + "Plack::Middleware::IIS7KeepAliveFix" => 0, + "Plack::Middleware::LighttpdScriptNameFix" => 0, + "Plack::Middleware::ContentLength" => 0, + "Plack::Middleware::Head" => 0, + "Plack::Middleware::HTTPExceptions" => 0, + "Plack::Middleware::FixMissingBodyInRedirect" => '0.09', + "Plack::Middleware::MethodOverride" => '0.12', + "Plack::Middleware::RemoveRedundantBody" => '0.03', + }, + }, + develop => { + requires => { + 'Test::Aggregate' => '0.364', + 'Test::Simple' => '0.88', + 'CatalystX::LeakChecker' => '0.05', + 'Catalyst::Devel' => '1.0', # For http server test + 'Catalyst::Engine::PSGI' => 0, + 'Test::WWW::Mechanize::Catalyst' => '0.51', + 'Test::TCP' => '2.00', # ditto, ships Net::EmptyPort + 'File::Copy::Recursive' => 0, + 'Starman' => 0, + 'MooseX::Daemonize' => 0, + 'Test::NoTabs' => 0, + 'Test::Pod' => 0, + 'Test::Pod::Coverage' => 0, + 'Test::Spelling' => 0, + 'Pod::Coverage::TrustPod' => 0, + 'Catalyst::Plugin::Params::Nested' => 0, + 'Catalyst::Plugin::ConfigLoader' => 0, + }, + }, + }, + resources => { + repository => { + # r/w: catagits@git.shadowcat.co.uk:Catalyst-Runtime.git + url => 'git://git.shadowcat.co.uk/catagits/Catalyst-Runtime.git', + web => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits/Catalyst-Runtime.git;a=summary', + type => 'git', + }, + x_IRC => 'irc://irc.perl.org/#catalyst', + bugtracker => { + web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Catalyst-Runtime', + mailto => 'bug-Catalyst-Runtime@rt.cpan.org', + }, + license => [ 'http://dev.perl.org/licenses/' ], + x_MailingList => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst', + homepage => 'http://dev.catalyst.perl.org/', + }, + no_index => { + directory => [ 't', 'xt' ] + }, + x_breaks => { + 'Catalyst::Plugin::SubRequest' => '<= 0.14', + 'Catalyst::Model::Akismet' => '<= 0.02', + 'Catalyst::Component::ACCEPT_CONTEXT' => '<= 0.06', + 'Catalyst::Plugin::ENV' => 0, # This plugin is just stupid, full stop + # should have been a core fix. + 'Catalyst::Plugin::Unicode::Encoding' => '<= 0.2', + 'Catalyst::Plugin::Authentication' => '<= 0.10010', # _config accessor in ::Credential::Password + 'Catalyst::Authentication::Credential::HTTP' => '<= 1.009', + 'Catalyst::Plugin::Session::Store::File' => '<= 0.16', + 'Catalyst::Plugin::Session' => '<= 0.21', + 'Catalyst::Plugin::Session::State::Cookie' => '<= 0.10', + 'Catalyst::Plugin::Session::Store::FastMmap' => '<= 0.09', + 'Catalyst::Controller::AllowDisable' => '<= 0.03', + 'Reaction' => '<= 0.001999', + 'Catalyst::Plugin::Upload::Image::Magick' => '<= 0.03', + 'Catalyst::Plugin::ConfigLoader' => '<= 0.22', # Older versions work but + # throw Data::Visitor warns + 'Catalyst::Devel' => '<= 1.19', + 'Catalyst::Plugin::SmartURI' => '<= 0.032', + 'CatalystX::CRUD' => '<= 0.37', + 'Catalyst::Action::RenderView' => '<= 0.07', + 'Catalyst::Plugin::DebugCookie' => '<= 0.999002', + 'Catalyst::Plugin::Authentication' => '<= 0.100091', + 'CatalystX::Imports' => '<= 0.03', + 'Catalyst::Plugin::HashedCookies' => '<= 1.03', + 'Catalyst::Action::REST' => '<= 0.67', + 'CatalystX::CRUD' => '<= 0.42', + 'CatalystX::CRUD::Model::RDBO' => '<= 0.20', + 'Catalyst::View::Mason' => '<= 0.17', +# Note these are not actually needed - they fail tests against the +# new version, but still work fine.. +# 'Catalyst::ActionRole::ACL' => '<= 0.05', +# 'Catalyst::Plugin::Session::Store::DBIC' => '<= 0.11', + 'Test::WWW::Mechanize::Catalyst' => '<= 0.53', # Dep warnings unless upgraded. + }, + x_authority => 'cpan:MSTROUT', +); -perl_version '5.008003'; - -name 'Catalyst-Runtime'; -author 'Sebastian Riedel '; -authority('cpan:MSTROUT'); -all_from 'lib/Catalyst/Runtime.pm'; - -requires 'List::Util' => '1.45'; -requires 'namespace::autoclean' => '0.28'; -requires 'namespace::clean' => '0.23'; -requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00903'; -requires 'Class::Load' => '0.12'; -requires 'Data::OptList'; -requires 'Moose' => '1.03'; -requires 'MooseX::MethodAttributes::Role::AttrContainer::Inheritable' => '0.24'; -requires 'MooseX::Role::WithOverloading' => '0.09' unless can_use('Moose', '2.1300'); -requires 'Carp' => '1.25'; -requires 'Class::C3::Adopt::NEXT' => '0.07'; -requires 'CGI::Simple::Cookie' => '1.109'; -requires 'Data::Dump'; -requires 'Data::OptList'; -requires 'HTML::Entities'; -requires 'HTML::HeadParser'; -requires 'HTTP::Body' => '1.22'; -requires 'HTTP::Headers' => '1.64'; -requires 'HTTP::Request' => '5.814'; -requires 'HTTP::Response' => '5.813'; -requires 'HTTP::Request::AsCGI' => '1.0'; -requires 'Module::Pluggable' => '4.7'; -requires 'Path::Class' => '0.09'; -requires 'Scalar::Util'; -requires 'Sub::Exporter'; -requires 'Text::SimpleTable' => '0.03'; -requires 'Time::HiRes'; -requires 'Tree::Simple' => '1.15'; -requires 'Tree::Simple::Visitor::FindByPath'; -requires 'Try::Tiny' => '0.17'; -requires 'Safe::Isa'; -requires 'Task::Weaken'; -requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness -requires 'MRO::Compat'; -requires 'MooseX::Getopt' => '0.48'; -requires 'String::RewritePrefix' => '0.004'; # Catalyst::Utils::resolve_namespace -requires 'Devel::InnerPackage'; # No longer core in blead -requires 'Plack' => '0.9991'; # IIS6+7 fix middleware -requires 'Plack::Middleware::ReverseProxy' => '0.04'; -requires 'Plack::Test::ExternalServer'; -requires 'Class::Data::Inheritable'; -requires 'Encode' => '2.49'; -requires 'LWP' => '5.837'; # LWP had unicode fail in 5.8.26 -requires 'URI' => '1.65'; -requires 'URI::ws' => '0.03'; -requires 'JSON::MaybeXS' => '1.000000'; -requires 'Stream::Buffered'; -requires 'Hash::MultiValue'; -requires 'Plack::Request::Upload'; -requires 'CGI::Struct'; -requires "Plack::Middleware::Conditional"; -requires "Plack::Middleware::IIS6ScriptNameFix"; -requires "Plack::Middleware::IIS7KeepAliveFix"; -requires "Plack::Middleware::LighttpdScriptNameFix"; -requires "Plack::Middleware::ContentLength"; -requires "Plack::Middleware::Head"; -requires "Plack::Middleware::HTTPExceptions"; -requires "Plack::Middleware::FixMissingBodyInRedirect" => '0.09'; -requires "Plack::Middleware::MethodOverride" => '0.12'; -requires "Plack::Middleware::RemoveRedundantBody" => '0.03'; - -test_requires 'Test::Fatal'; -test_requires 'Test::More' => '0.88'; -test_requires 'Data::Dump'; -test_requires 'HTTP::Request::Common'; -test_requires 'IO::Scalar'; -test_requires 'HTTP::Status'; -test_requires 'JSON::MaybeXS'; - -# see also cpanfile for authordeps -- install via -# cpanm --installdeps --with-develop . - -# aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate and a Test::Simple it works with is available -my @author_requires; -if ($ENV{AGGREGATE_TESTS} && can_use('Test::Simple', '0.88') && can_use('Test::Aggregate', '0.364')) { - push(@author_requires, 'Test::Aggregate', '0.364'); - push(@author_requires, 'Test::Simple', '0.88'); +my $tests = 't/*.t'; +if ($ENV{AGGREGATE_TESTS} && eval { require Test::Aggregate; Test::Aggregate->VERSION(0.364); }) { open my $fh, '>', '.aggregating'; } else { unlink '.aggregating'; - tests 't/*.t t/aggregate/*.t'; + $tests .= ' t/aggregate/*.t'; } -push(@author_requires, 'CatalystX::LeakChecker', '0.05'); -push(@author_requires, 'Catalyst::Devel', '1.0'); # For http server test -push(@author_requires, 'Test::WWW::Mechanize::Catalyst', '0.51'); -push(@author_requires, 'Test::TCP', '2.00'); # ditto, ships Net::EmptyPort - -author_tests('t/author'); -author_requires( - @author_requires, - map {; $_ => 0 } qw( - File::Copy::Recursive - Starman - MooseX::Daemonize - Test::NoTabs - Test::Pod - Test::Pod::Coverage - Test::Spelling - Pod::Coverage::TrustPod - Catalyst::Plugin::Params::Nested - Catalyst::Plugin::ConfigLoader -)); - -if ($Module::Install::AUTHOR) { - darwin_check_no_resource_forks(); +my %MM_ARGS = ( + test => { TESTS => $tests }, + EXE_FILES => [ glob 'script/*.pl' ], + PREREQ_PM => { + (eval { require Moose; Moose->VERSION('2.1300') } ? () : ( + 'MooseX::Role::WithOverloading' => '0.09' + )), + }, +); + +## BOILERPLATE ############################################################### +require ExtUtils::MakeMaker; +(do './maint/Makefile.PL.include' or die $@) unless -f 'META.yml'; + +# have to do this since old EUMM dev releases miss the eval $VERSION line +my $eumm_version = eval $ExtUtils::MakeMaker::VERSION; +my $mymeta = $eumm_version >= 6.57_02; +my $mymeta_broken = $mymeta && $eumm_version < 6.57_07; + +($MM_ARGS{NAME} = $META{name}) =~ s/-/::/g; +($MM_ARGS{VERSION_FROM} = "lib/$MM_ARGS{NAME}.pm") =~ s{::}{/}g; +$META{license} = [ $META{license} ] + if $META{license} && !ref $META{license}; +$MM_ARGS{LICENSE} = $META{license}[0] + if $META{license} && $eumm_version >= 6.30; +$MM_ARGS{NO_MYMETA} = 1 + if $mymeta_broken; +$MM_ARGS{META_ADD} = { 'meta-spec' => { version => 2 }, %META } + unless -f 'META.yml'; + +for (qw(configure build test runtime)) { + my $key = $_ eq 'runtime' ? 'PREREQ_PM' : uc $_.'_REQUIRES'; + my $r = $MM_ARGS{$key} = { + %{$META{prereqs}{$_}{requires} || {}}, + %{delete $MM_ARGS{$key} || {}}, + }; + defined $r->{$_} or delete $r->{$_} for keys %$r; } -resources( - 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst', - 'IRC' => 'irc://irc.perl.org/#catalyst', - 'license', => 'http://dev.perl.org/licenses/', - 'homepage', => 'http://dev.catalyst.perl.org/', - # r/w: catagits@git.shadowcat.co.uk:Catalyst-Runtime.git - # web: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits/Catalyst-Runtime.git;a=summary - 'repository', => 'git://git.shadowcat.co.uk/catagits/Catalyst-Runtime.git', -); +$MM_ARGS{MIN_PERL_VERSION} = delete $MM_ARGS{PREREQ_PM}{perl} || 0; -install_script glob('script/*.pl'); -auto_install; -WriteAll; +delete $MM_ARGS{MIN_PERL_VERSION} + if $eumm_version < 6.47_01; +$MM_ARGS{BUILD_REQUIRES} = {%{$MM_ARGS{BUILD_REQUIRES}}, %{delete $MM_ARGS{TEST_REQUIRES}}} + if $eumm_version < 6.63_03; +$MM_ARGS{PREREQ_PM} = {%{$MM_ARGS{PREREQ_PM}}, %{delete $MM_ARGS{BUILD_REQUIRES}}} + if $eumm_version < 6.55_01; +delete $MM_ARGS{CONFIGURE_REQUIRES} + if $eumm_version < 6.51_03; + +ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS); +## END BOILERPLATE ########################################################### print <<"EOF"; @@ -167,60 +245,3 @@ print <<"EOF"; Have fun! EOF - -# NOTE - This is the version number of the _incompatible_ code, -# not the version number of the fixed version. -my %conflicts = ( - 'Catalyst::Plugin::SubRequest' => '0.14', - 'Catalyst::Model::Akismet' => '0.02', - 'Catalyst::Component::ACCEPT_CONTEXT' => '0.06', - 'Catalyst::Plugin::ENV' => '9999', # This plugin is just stupid, full stop - # should have been a core fix. - 'Catalyst::Plugin::Unicode::Encoding' => '0.2', - 'Catalyst::Plugin::Authentication' => '0.10010', # _config accessor in ::Credential::Password - 'Catalyst::Authentication::Credential::HTTP' => '1.009', - 'Catalyst::Plugin::Session::Store::File' => '0.16', - 'Catalyst::Plugin::Session' => '0.21', - 'Catalyst::Plugin::Session::State::Cookie' => '0.10', - 'Catalyst::Plugin::Session::Store::FastMmap' => '0.09', - 'Catalyst::Controller::AllowDisable' => '0.03', - 'Reaction' => '0.001999', - 'Catalyst::Plugin::Upload::Image::Magick' => '0.03', - 'Catalyst::Plugin::ConfigLoader' => '0.22', # Older versions work but - # throw Data::Visitor warns - 'Catalyst::Devel' => '1.19', - 'Catalyst::Plugin::SmartURI' => '0.032', - 'CatalystX::CRUD' => '0.37', - 'Catalyst::Action::RenderView' => '0.07', - 'Catalyst::Plugin::DebugCookie' => '0.999002', - 'Catalyst::Plugin::Authentication' => '0.100091', - 'CatalystX::Imports' => '0.03', - 'Catalyst::Plugin::HashedCookies' => '1.03', - 'Catalyst::Action::REST' => '0.67', - 'CatalystX::CRUD' => '0.42', - 'CatalystX::CRUD::Model::RDBO' => '0.20', - 'Catalyst::View::Mason' => '0.17', -# Note these are not actually needed - they fail tests against the -# new version, but still work fine.. -# 'Catalyst::ActionRole::ACL' => '0.05', -# 'Catalyst::Plugin::Session::Store::DBIC' => '0.11', - 'Test::WWW::Mechanize::Catalyst' => '0.53', # Dep warnings unless upgraded. -); -check_conflicts(%conflicts); - -# End of script, helper functions below. - -sub darwin_check_no_resource_forks { - if ($^O eq 'darwin') { - my $osx_ver = `/usr/bin/sw_vers -productVersion`; - chomp $osx_ver; - - # TAR on 10.4 wants COPY_EXTENDED_ATTRIBUTES_DISABLE - # On 10.5 (Leopard) it wants COPYFILE_DISABLE - my $attr = $osx_ver =~ /^10.(5|6|7|8)/ ? 'COPYFILE_DISABLE' : 'COPY_EXTENDED_ATTRIBUTES_DISABLE'; - - makemaker_args(dist => { PREOP => qq{\@if [ "\$\$$attr" != "true" ]; then}. - qq{ echo "You must set the ENV variable $attr to 'true',"; }. - ' echo "to avoid getting resource forks in your dist."; exit 255; fi' }); - } -} diff --git a/cpanfile b/cpanfile deleted file mode 100644 index 4e0cb76..0000000 --- a/cpanfile +++ /dev/null @@ -1,22 +0,0 @@ -# install these with the command: -# cpanm --installdeps --with-develop . -on 'develop' => sub { - requires 'Test::Simple' => '0.88'; - requires 'Test::Aggregate' => '0.364'; - requires 'CatalystX::LeakChecker' => '0.05'; - requires 'Catalyst::Devel' => '1.0'; # For http server test - requires 'Test::WWW::Mechanize::Catalyst' => '0.51'; - requires 'Test::TCP' => '1.27'; # ditto, ships Net::EmptyPort - requires 'File::Copy::Recursive' => 0; - requires 'Catalyst::Engine::PSGI' => 0; - requires 'Test::Without::Module' => 0; - requires 'Starman' => 0; - requires 'MooseX::Daemonize' => 0; - requires 'Test::NoTabs' => 0; - requires 'Test::Pod' => 0; - requires 'Test::Pod::Coverage' => 0; - requires 'Test::Spelling' => 0; - requires 'Pod::Coverage::TrustPod' => 0; - requires 'Catalyst::Plugin::Params::Nested' => 0; - requires 'Catalyst::Plugin::ConfigLoader' => 0; -}; diff --git a/maint/Makefile.PL.include b/maint/Makefile.PL.include new file mode 100644 index 0000000..d41f46e --- /dev/null +++ b/maint/Makefile.PL.include @@ -0,0 +1,20 @@ +BEGIN { -e 'Distar' or system("git clone git://git.shadowcat.co.uk/p5sagit/Distar.git") } +use lib 'Distar/lib'; +use Distar 0.001; + +author 'Sebastian Riedel '; + +manifest_include t => 'catalyst_130pix.gif'; +manifest_include 't/conf' => 'extra.conf.in'; +manifest_include 't/lib/TestAppEncodingSetInConfig' => 'testappencodingsetinconfig.json'; +manifest_include 't/lib/TestContentNegotiation/share', 'file.txt'; +manifest_include 't/lib/TestMiddleware/share' => qr/.*/; +manifest_include 't/lib/TestMiddlewareFromConfig/share' => qr/.*/; +manifest_include 't/lib/TestMiddlewareFromConfig' => 'testmiddlewarefromconfig.pl'; +manifest_include t => qr/optional_apache-.*\.pl/; +manifest_include t => 'optional_stress.yml'; +manifest_include t => 'something/Makefile.PL'; +manifest_include t => 'something/script/foo/bar/for_dist'; +manifest_include t => 'utf8.txt'; + +1; diff --git a/t/author/http-server.t b/xt/author/http-server.t similarity index 99% rename from t/author/http-server.t rename to xt/author/http-server.t index 2861c27..2285211 100644 --- a/t/author/http-server.t +++ b/xt/author/http-server.t @@ -88,7 +88,7 @@ is( $return, 0, 'live tests' ); # kill 'INT' doesn't exist in Windows, so to prevent child hanging, # this process will need to commit seppuku to clean up the children. if ($^O eq 'MSWin32') { - # Furthermore, it needs to do it 'politely' so that TAP doesn't + # Furthermore, it needs to do it 'politely' so that TAP doesn't # smell anything 'dubious'. require Win32::Process; # core in all versions of Win32 Perl Win32::Process::KillProcess($$, $return); diff --git a/t/author/notabs.t b/xt/author/notabs.t similarity index 86% rename from t/author/notabs.t rename to xt/author/notabs.t index 5cd3ae0..40cfed5 100644 --- a/t/author/notabs.t +++ b/xt/author/notabs.t @@ -2,9 +2,7 @@ use strict; use warnings; use File::Spec; -use FindBin (); use Test::More; use Test::NoTabs; all_perl_files_ok(qw/lib/); - diff --git a/t/author/pod.t b/xt/author/pod.t similarity index 98% rename from t/author/pod.t rename to xt/author/pod.t index f908f73..6a644e9 100644 --- a/t/author/pod.t +++ b/xt/author/pod.t @@ -5,4 +5,3 @@ use Test::More; use Test::Pod 1.14; all_pod_files_ok(); - diff --git a/t/author/podcoverage.t b/xt/author/podcoverage.t similarity index 99% rename from t/author/podcoverage.t rename to xt/author/podcoverage.t index 894f122..fe3f601 100644 --- a/t/author/podcoverage.t +++ b/xt/author/podcoverage.t @@ -21,4 +21,3 @@ foreach my $module (@modules) { } done_testing; - diff --git a/t/author/spelling.t b/xt/author/spelling.t similarity index 100% rename from t/author/spelling.t rename to xt/author/spelling.t diff --git a/t/author/unicode_plugin_nested_params.t b/xt/author/unicode_plugin_nested_params.t similarity index 98% rename from t/author/unicode_plugin_nested_params.t rename to xt/author/unicode_plugin_nested_params.t index f9f47c6..e2680d1 100644 --- a/t/author/unicode_plugin_nested_params.t +++ b/xt/author/unicode_plugin_nested_params.t @@ -5,7 +5,7 @@ use utf8; # setup library path use FindBin qw($Bin); -use lib "$Bin/../lib"; +use lib "$Bin/../../t/lib"; BEGIN { eval { require Catalyst::Plugin::Params::Nested; 1; } || plan skip_all => 'Need Catalyst::Plugin::Params::Nested' } @@ -28,14 +28,14 @@ BEGIN { { my ($res, $c) = ctx_request("/?foo.1=bar&foo.2=$escape_str"); is( $c->res->output, '

It works

', 'Content displayed' ); - + my $got = $c->request->parameters; my $expected = { 'foo.1' => 'bar', 'foo.2' => $decode_str, 'foo' => [undef, 'bar', $decode_str], }; - + is( $got->{foo}->[0], undef, '{foo}->[0] is undef' ); is( $got->{foo}->[1], 'bar', '{foo}->[1] is bar' ); ok( utf8::is_utf8( $got->{'foo.2'} ), '{foo.2} is utf8' ); @@ -45,7 +45,7 @@ BEGIN { { my ($res, $c) = ctx_request("/?foo.1=bar&foo.2=$escape_str&bar.baz=$escape_str&baz.bar.foo=$escape_str&&arr.0.1=$escape_str"); - + my $got = $c->request->parameters; my $expected = { 'foo.1' => 'bar', @@ -58,7 +58,7 @@ BEGIN { 'bar' => { baz => $decode_str }, 'baz' => { bar => { foo => $decode_str } }, }; - + is( ref $got->{arr}->[0], 'ARRAY', '{arr}->[0] is ARRAY' ); ok( utf8::is_utf8( $got->{arr}->[0]->[1] ), '{arr}->[0]->[1] is utf8' ); ok( utf8::is_utf8( $got->{bar}{baz} ), '{bar}{baz} is utf8' );