Skip to content
Browse files

Merge branch 'release/1.1999_04'

  • Loading branch information...
2 parents ea9ef19 + 78b058d commit 338865c4946134a26bec3e1233c76be54ce9561d @xsawyerx xsawyerx committed
Showing with 13 additions and 5 deletions.
  1. +7 −0 CHANGES
  2. +1 −1 lib/Dancer.pm
  3. +1 −1 lib/Dancer/Test.pm
  4. +3 −2 t/07_apphandlers/05_middlewares.t
  5. +1 −1 t/pod.t
View
7 CHANGES
@@ -1,3 +1,10 @@
+Dancer 1.1999_04 (RC4)
+ [ Sawyer X ]
+ * Load Plack::Loader dynamically in test.
+
+ [ Yanick Champoux ]
+ * Doc fix.
+
Dancer 1.1999_03 (RC3)
[ Alexis Sukrieh ]
* Transparent unicode support
View
2 lib/Dancer.pm
@@ -31,7 +31,7 @@ use File::Basename 'basename';
use base 'Exporter';
$AUTHORITY = 'SUKRIA';
-$VERSION = '1.1999_03';
+$VERSION = '1.1999_04';
@EXPORT = qw(
after
any
View
2 lib/Dancer/Test.pm
@@ -255,7 +255,7 @@ This module provides test heplers for testing Dancer apps.
=head1 CONFIGURATON
When importing Dancer::Test, the appdir is set by defaut to '..', assuming that
-your test scrtipt is directly in your t/ directory. If you put your test scrtipt
+your test script is directly in your t/ directory. If you put your test script
deeper in the 't/' hierarchy (like in 't/routes/01_some_test.t') you'll have to
tell Dancer::Test that the appdir is one step upper.
View
5 t/07_apphandlers/05_middlewares.t
@@ -4,7 +4,8 @@ use warnings;
use Dancer ':syntax';
use Dancer::ModuleLoader;
-use Plack::Loader;
+use LWP::UserAgent;
+
use File::Spec;
use lib File::Spec->catdir( 't', 'lib' );
@@ -13,7 +14,7 @@ plan skip_all => "Test::TCP is needed for this test"
plan skip_all => "Plack is needed to run this test"
unless Dancer::ModuleLoader->load('Plack::Request');
-use LWP::UserAgent;
+Dancer::ModuleLoader->load('Plack::Loader');
# XXX the first test will be useless when we will remove support
# for hashref middlewares list
View
2 t/pod.t
@@ -5,7 +5,7 @@ use warnings;
use Test::More;
# Ensure a recent version of Test::Pod
-my $min_tp = 1.22;
+my $min_tp = 1.44;
eval "use Test::Pod $min_tp";
plan skip_all => "Test::Pod $min_tp required for testing POD" if $@;

0 comments on commit 338865c

Please sign in to comment.
Something went wrong with that request. Please try again.