Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'release/1.3059_02'

  • Loading branch information...
commit a37ca92049ea2f7263c703bb19e406e076a738fe 2 parents a9ccc93 + 3126013
Alexis Sukrieh authored
Showing with 16 additions and 8 deletions.
  1. +9 −1 CHANGES
  2. +1 −1  lib/Dancer.pm
  3. +6 −6 t/22_hooks/04_template.t
View
10 CHANGES
@@ -1,4 +1,12 @@
-1.3059_01 27.05.2011
+1.3059_02 29.05.2011
+
+ [ BUG FIXES ]
+ * Fix for smoker failure under Perl 5.13.4
+ http://www.cpantesters.org/cpan/report/b37416b8-88df-11e0-9c74-cad5bcb8094c
+ Better use of Time::Hires in t/22_hooks/04_template.t
+ (Franck Cuny)
+
+1.3059_01 27.05.2011
[ API CHANGES ]
* Second level of deprecation for render_with_layout method.
View
2  lib/Dancer.pm
@@ -5,7 +5,7 @@ use warnings;
use Carp;
use Cwd 'realpath';
-our $VERSION = '1.3059_01';
+our $VERSION = '1.3059_02';
our $AUTHORITY = 'SUKRIA';
use Dancer::App;
View
12 t/22_hooks/04_template.t
@@ -4,15 +4,15 @@ use warnings;
use Test::More tests => 7, import => ['!pass'];
use Dancer ':syntax';
use Dancer::Test;
-use Time::HiRes qw/gettimeofday/;
+use Time::HiRes qw/gettimeofday tv_interval/;
-my ( $start, $diff );
+my ($t0, $elapsed);
ok(
before_template sub {
my $tokens = shift;
$tokens->{foo} = 'bar';
- ( undef, $start ) = gettimeofday();
+ $t0 = [gettimeofday];
}
);
@@ -21,7 +21,7 @@ ok(
my $full_content = shift;
like $$full_content, qr/foo => bar/;
my ( undef, $end ) = gettimeofday();
- $diff = $end - $start;
+ $elapsed = tv_interval($t0);
}
);
@@ -34,5 +34,5 @@ get '/' => sub {
route_exists [ GET => '/' ];
response_content_like( [ GET => '/' ], qr/foo => bar/ );
-ok $diff;
-cmp_ok $diff, '>', 0;
+ok $elapsed;
+cmp_ok $elapsed, '>', 0;
Please sign in to comment.
Something went wrong with that request. Please try again.