Merge branch 'release/1.3100' into devel

adionditsak · Aug 25, 2012 · 806a7ee · 806a7ee
2 parents e1deac9 + cc52b81
commit 806a7ee
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 6 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,18 @@
 {{$NEXT}}
 
+1.3100      25.08.2012
+
+    [ BUG FIXES ]
+    * GH #816: Improve wording when failed to load engine. (Sawyer X)
+    * GH #817: Fix CODE reference uncloned using Clone::clone.
+      (David Previous, Sawyer X)
+
+    [ ENHANCEMENTS ]
+    * GH #755: HTTP::Headers accepted by dancer_response. (Roberto Patriarca)
+
+    [ DOCUMENTATION ]
+    * GH #818: Use "MyWeb::App" instead of "mywebapp" in examples. (pdl)
+
 1.3099      11.08.2012
 
     [ BUG FIXES ]

diff --git a/lib/Dancer.pm b/lib/Dancer.pm
@@ -5,7 +5,7 @@ use warnings;
 use Carp;
 use Cwd 'realpath';
 
-our $VERSION   = '1.3099';
+our $VERSION   = '1.3100';
 our $AUTHORITY = 'SUKRIA';
 
 $VERSION = eval $VERSION;

diff --git a/t/01_config/03_logger.t b/t/01_config/03_logger.t
@@ -14,7 +14,7 @@ my $dir = File::Temp::tempdir(CLEANUP => 1, TMPDIR => 1);
 set appdir => $dir;
 
 eval { set logger => 'foobar' };
-like($@, qr/unknown logger/, 'invalid logger detected');
+like($@, qr/unable to load logger/, 'invalid logger detected');
 
 ok(set(logger => 'file'), 'file-based logger correctly set');
 

diff --git a/t/08_session/02_dependency_check.t b/t/08_session/02_dependency_check.t
@@ -50,6 +50,6 @@ is($@, '', "the session engine can be set with CGI::Session");
 
 # load an unknown session engine
 eval { set(session => 'galactica') };
-like $@, qr/unknown session engine 'galactica'/, 
+like $@, qr/unable to load session engine 'galactica'/,
     "Unknown session engine is refused";
 
diff --git a/t/10_template/01_factory.t b/t/10_template/01_factory.t
@@ -15,7 +15,7 @@ use_ok 'Dancer::Template';
 ok(Dancer::Template->init, "template init with undef setting");
 
 eval { setting template => 'FOOOBAR' };
-like $@, qr/unknown template engine/, "cannot load unknown template engine";
+like $@, qr/unable to load template engine/, "cannot load unknown template engine";
 
 setting template => 'simple';
 ok(Dancer::Template->init, "template init with 'simple' setting");

diff --git a/t/11_logger/02_factory.t b/t/11_logger/02_factory.t
@@ -20,7 +20,7 @@ my $engine = Dancer::Logger->logger;
 ok !defined($engine), "engine not defined";
 
 eval { Dancer::Logger->init('foo') };
-like $@, qr/unknown logger engine 'foo'/,
+like $@, qr/unable to load logger engine 'foo'/,
     'unknown logger engine detected';
 
 ok(Dancer::Logger->init('file'), 'logger file initialized');

diff --git a/t/14_serializer/01_helpers.t b/t/14_serializer/01_helpers.t
@@ -11,7 +11,7 @@ my $struct = {eris => 23};
     # test an unknown serializer
     eval { setting serializer => 'FooBar'; };
     like $@,
-      qr/unknown serializer engine 'FooBar', perhaps you need to install Dancer::Serializer::FooBar/,
+      qr/unable to load serializer engine 'FooBar', perhaps you need to install Dancer::Serializer::FooBar/,
       "Foobar is not a valid serializer";
 }