[Bps-public-commit] Path-Dispatcher branch, master, updated. 074101f4f457303ec1c132bcfee6833eaf8fc114
Shawn Moore
sartak at bestpractical.com
Sun Oct 24 01:18:05 EDT 2010
The branch, master has been updated
via 074101f4f457303ec1c132bcfee6833eaf8fc114 (commit)
via d9c50d179926a58ecb4f7a4ed719565c3b3f3ddc (commit)
from ae5124e9b7185e66bd5c97e166e14d48c3251ec7 (commit)
Summary of changes:
Makefile.PL | 7 ++++---
t/000-compile.t | 3 ++-
t/001-api.t | 3 ++-
t/002-rule.t | 4 +++-
t/003-404.t | 4 +++-
t/004-run.t | 4 +++-
t/005-multi-rule.t | 4 +++-
t/006-abort.t | 4 +++-
t/007-coderef-matcher.t | 4 +++-
t/009-args.t | 4 +++-
t/010-return.t | 4 +++-
t/011-next-rule.t | 4 +++-
t/012-under.t | 5 ++++-
t/013-tokens.t | 4 +++-
t/014-tokens-prefix.t | 4 +++-
t/015-regex-prefix.t | 4 +++-
t/017-intersection.t | 4 +++-
t/018-metadata.t | 4 +++-
t/019-intersection-metadata.t | 4 +++-
t/022-numbers-undef.t | 4 +++-
t/023-alternation.t | 4 +++-
t/024-sequence.t | 4 +++-
t/025-sequence-custom-rule.t | 4 +++-
t/026-named-captures.t | 4 +++-
t/030-exceptions.t | 5 ++++-
t/100-match-object.t | 4 +++-
t/901-return-values.t | 4 +++-
t/902-coderef.t | 4 +++-
28 files changed, 85 insertions(+), 30 deletions(-)
- Log -----------------------------------------------------------------
commit d9c50d179926a58ecb4f7a4ed719565c3b3f3ddc
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Sun Oct 24 14:03:10 2010 +0900
Use done_testing like Moose does
diff --git a/t/000-compile.t b/t/000-compile.t
index f7cd8d0..e76d804 100644
--- a/t/000-compile.t
+++ b/t/000-compile.t
@@ -1,7 +1,8 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 1;
+use Test::More;
use_ok 'Path::Dispatcher';
+done_testing;
diff --git a/t/001-api.t b/t/001-api.t
index e59f683..cd86805 100644
--- a/t/001-api.t
+++ b/t/001-api.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 12;
+use Test::More;
use Path::Dispatcher;
my @calls;
@@ -55,3 +55,4 @@ isa_ok($dispatch, 'Path::Dispatcher::Dispatch');
$dispatch->run;
is_deeply([splice @calls], [ ['bar'] ], "invoked the rule block on 'run', makes sure ->pos etc are still correctly set");
+done_testing;
diff --git a/t/002-rule.t b/t/002-rule.t
index 17d53d3..60e91ea 100644
--- a/t/002-rule.t
+++ b/t/002-rule.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 4;
+use Test::More;
use Path::Dispatcher::Rule;
my @calls;
@@ -27,3 +27,5 @@ is_deeply([splice @calls], [{
args => [],
}], "block called on ->run");
+done_testing;
+
diff --git a/t/003-404.t b/t/003-404.t
index 9d08740..ed90fec 100644
--- a/t/003-404.t
+++ b/t/003-404.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 4;
+use Test::More;
use Path::Dispatcher;
my @calls;
@@ -23,3 +23,5 @@ is($dispatch->matches, 0, "no matches");
$dispatch->run;
is_deeply([splice @calls], [], "no calls to the rule block");
+done_testing;
+
diff --git a/t/004-run.t b/t/004-run.t
index bf01282..6b1c77d 100644
--- a/t/004-run.t
+++ b/t/004-run.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 4;
+use Test::More;
use Path::Dispatcher;
my $dispatcher = Path::Dispatcher->new(
@@ -33,3 +33,5 @@ is($result, "foobar matched");
my @results = $dispatch->run("foobar");
is_deeply(\@results, ["foobar matched"]);
+done_testing;
+
diff --git a/t/005-multi-rule.t b/t/005-multi-rule.t
index ad10594..51f9dc4 100644
--- a/t/005-multi-rule.t
+++ b/t/005-multi-rule.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 1;
+use Test::More;
use Path::Dispatcher;
my @calls;
@@ -19,3 +19,5 @@ for my $number (qw/first second/) {
$dispatcher->run('foo');
is_deeply(\@calls, ['first']);
+done_testing;
+
diff --git a/t/006-abort.t b/t/006-abort.t
index 9e68032..9bd43e9 100644
--- a/t/006-abort.t
+++ b/t/006-abort.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 6;
+use Test::More;
use Test::Exception;
use Path::Dispatcher;
@@ -55,3 +55,5 @@ throws_ok {
is_deeply([splice @calls], ['bar: before'], "regular dies pass through");
+done_testing;
+
diff --git a/t/007-coderef-matcher.t b/t/007-coderef-matcher.t
index 80779ff..86fa0f0 100644
--- a/t/007-coderef-matcher.t
+++ b/t/007-coderef-matcher.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 3;
+use Test::More;
use Path::Dispatcher;
my (@matches, @calls);
@@ -22,3 +22,5 @@ is_deeply([splice @calls], [ [] ]);
$dispatcher->run('other');
is($matches[0]->path, 'other');
+done_testing;
+
diff --git a/t/009-args.t b/t/009-args.t
index 7473e13..9355f45 100644
--- a/t/009-args.t
+++ b/t/009-args.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 2;
+use Test::More;
use Path::Dispatcher;
my @calls;
@@ -27,3 +27,5 @@ is_deeply([splice @calls], [
[24],
]);
+done_testing;
+
diff --git a/t/010-return.t b/t/010-return.t
index 2952d88..678f00b 100644
--- a/t/010-return.t
+++ b/t/010-return.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 4;
+use Test::More;
use Path::Dispatcher;
# we currently have no defined return strategy :/
@@ -31,3 +31,5 @@ is_deeply([$dispatcher->run('foo', 42)], ["foo"]);
$dispatch = $dispatcher->dispatch('foo');
is_deeply([$dispatch->run(24)], ["foo"]);
+done_testing;
+
diff --git a/t/011-next-rule.t b/t/011-next-rule.t
index 225da20..941c55e 100644
--- a/t/011-next-rule.t
+++ b/t/011-next-rule.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 6;
+use Test::More;
use Test::Exception;
use Path::Dispatcher;
@@ -56,3 +56,5 @@ throws_ok {
is_deeply([splice @calls], ['bar: before'], "regular dies pass through");
+done_testing;
+
diff --git a/t/012-under.t b/t/012-under.t
index 24174db..9b2e1a6 100644
--- a/t/012-under.t
+++ b/t/012-under.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 15;
+use Test::More;
use Path::Dispatcher;
my $predicate = Path::Dispatcher::Rule::Tokens->new(
@@ -85,3 +85,6 @@ eval {
);
};
like($@, qr/Attribute \(predicate\) does not pass the type constraint /, "predicate MUST match just a prefix");
+
+done_testing;
+
diff --git a/t/013-tokens.t b/t/013-tokens.t
index fb535b1..68d8ab5 100644
--- a/t/013-tokens.t
+++ b/t/013-tokens.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 10;
+use Test::More;
use Path::Dispatcher;
my @calls;
@@ -72,3 +72,5 @@ my $rule = Path::Dispatcher::Rule::Tokens->new(
my $match = $rule->match(Path::Dispatcher::Path->new('Path::Dispatcher::Rule::Tokens'));
is($match->leftover, 'Rule::Tokens');
+done_testing;
+
diff --git a/t/014-tokens-prefix.t b/t/014-tokens-prefix.t
index 8924e99..d376e94 100644
--- a/t/014-tokens-prefix.t
+++ b/t/014-tokens-prefix.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 5;
+use Test::More;
use Path::Dispatcher;
my $rule = Path::Dispatcher::Rule::Tokens->new(
@@ -18,3 +18,5 @@ ok($match, "prefix matches a prefix of the path");
is_deeply($match->positional_captures, ["foo", "bar"]);
is($match->leftover, "baz");
+done_testing;
+
diff --git a/t/015-regex-prefix.t b/t/015-regex-prefix.t
index eae193c..b43f68e 100644
--- a/t/015-regex-prefix.t
+++ b/t/015-regex-prefix.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 6;
+use Test::More;
use Path::Dispatcher;
my @calls;
@@ -22,3 +22,5 @@ ok($match, "matched foobar:baz");
is_deeply($match->positional_captures, ["foo", "bar"], "match returns just the results");
is($match->leftover, ':baz', "leftovers");
+done_testing;
+
diff --git a/t/017-intersection.t b/t/017-intersection.t
index 4228727..6301869 100644
--- a/t/017-intersection.t
+++ b/t/017-intersection.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 4;
+use Test::More;
use Path::Dispatcher;
my @calls;
@@ -46,3 +46,5 @@ $dispatcher = Path::Dispatcher->new(
$dispatcher->run("foo");
is_deeply([splice @calls], [], "no subrules means no match");
+done_testing;
+
diff --git a/t/018-metadata.t b/t/018-metadata.t
index 079f00d..0049c8b 100644
--- a/t/018-metadata.t
+++ b/t/018-metadata.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 2;
+use Test::More;
use Path::Dispatcher;
my @calls;
@@ -33,3 +33,5 @@ $dispatcher->run(Path::Dispatcher::Path->new(
));
is_deeply([splice @calls], [], "metadata didn't match");
+
+done_testing;
diff --git a/t/019-intersection-metadata.t b/t/019-intersection-metadata.t
index ab25efc..9c314c5 100644
--- a/t/019-intersection-metadata.t
+++ b/t/019-intersection-metadata.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 2;
+use Test::More;
use Path::Dispatcher;
my $dispatcher = Path::Dispatcher->new(
@@ -40,3 +40,5 @@ is_deeply(\@results, ["creating a ticket"], "matched path and metadata");
is_deeply(\@results, [], "didn't match metadata");
+done_testing;
+
diff --git a/t/022-numbers-undef.t b/t/022-numbers-undef.t
index 5d9ca56..0ce65a2 100644
--- a/t/022-numbers-undef.t
+++ b/t/022-numbers-undef.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 2;
+use Test::More;
use Path::Dispatcher;
my @recaptures;
@@ -18,3 +18,5 @@ is_deeply($match->positional_captures, ['foo', undef, 'baz']);
$match->run;
is_deeply(\@recaptures, ['foo', undef, 'baz']);
+done_testing;
+
diff --git a/t/023-alternation.t b/t/023-alternation.t
index 78ebd37..6733821 100644
--- a/t/023-alternation.t
+++ b/t/023-alternation.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 13;
+use Test::More;
use Path::Dispatcher;
my @calls;
@@ -56,3 +56,5 @@ $dispatcher = Path::Dispatcher->new(
$dispatcher->run("foo");
is_deeply([splice @calls], [], "no subrules means no match");
+done_testing;
+
diff --git a/t/024-sequence.t b/t/024-sequence.t
index 757a0cc..6e61c29 100644
--- a/t/024-sequence.t
+++ b/t/024-sequence.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 10;
+use Test::More;
use Path::Dispatcher;
my @calls;
@@ -127,3 +127,5 @@ my $rule = Path::Dispatcher::Rule::Sequence->new(
my $match = $rule->match(Path::Dispatcher::Path->new('Path::Dispatcher::Rule::Tokens'));
is($match->leftover, 'Rule::Tokens');
+done_testing;
+
diff --git a/t/025-sequence-custom-rule.t b/t/025-sequence-custom-rule.t
index d03b51d..8494ecc 100644
--- a/t/025-sequence-custom-rule.t
+++ b/t/025-sequence-custom-rule.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 47;
+use Test::More;
use Path::Dispatcher;
my @calls;
@@ -122,3 +122,5 @@ is_deeply([$dispatcher->complete("use perl pl")], ["use perl please"]);
is_deeply([$dispatcher->complete("use perl pleas")], ["use perl please"]);
is_deeply([$dispatcher->complete("use perl please")], []);
is_deeply([$dispatcher->complete("use perl plx")], []);
+
+done_testing;
diff --git a/t/026-named-captures.t b/t/026-named-captures.t
index e39b5ed..c6ccc54 100644
--- a/t/026-named-captures.t
+++ b/t/026-named-captures.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 4;
+use Test::More;
use Path::Dispatcher;
my $dispatcher = Path::Dispatcher->new(
@@ -21,3 +21,5 @@ $match = $dispatcher->run("positional firstnamed secondnamed");
is_deeply($match->positional_captures, ["positional", "firstnamed", "secondnamed"]);
is_deeply($match->named_captures, { second => "firstnamed", third => "secondnamed" });
+done_testing;
+
diff --git a/t/030-exceptions.t b/t/030-exceptions.t
index 5c633a2..d152c9a 100644
--- a/t/030-exceptions.t
+++ b/t/030-exceptions.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 1;
+use Test::More;
use Test::Exception;
use Path::Dispatcher;
@@ -23,3 +23,6 @@ my $dispatcher = Path::Dispatcher->new(
throws_ok(sub {
$dispatcher->run("foobar");
}, $not_true);
+
+done_testing;
+
diff --git a/t/100-match-object.t b/t/100-match-object.t
index d5a98a2..73326b5 100644
--- a/t/100-match-object.t
+++ b/t/100-match-object.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 8;
+use Test::More;
use Path::Dispatcher;
my $match;
@@ -29,3 +29,5 @@ is_deeply($match->pos(5), undef);
is_deeply($match->pos(-1), "cute");
+done_testing;
+
diff --git a/t/901-return-values.t b/t/901-return-values.t
index 9df6416..7b4b372 100644
--- a/t/901-return-values.t
+++ b/t/901-return-values.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 1;
+use Test::More;
use Test::Exception;
use Path::Dispatcher;
@@ -17,3 +17,5 @@ throws_ok {
$dispatcher->dispatch('foo');
} qr/Results returned from _match must be a hashref/;
+done_testing;
+
diff --git a/t/902-coderef.t b/t/902-coderef.t
index 9496392..57af809 100644
--- a/t/902-coderef.t
+++ b/t/902-coderef.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More tests => 3;
+use Test::More;
use Test::Exception;
use Path::Dispatcher::Rule::Tokens;
@@ -20,3 +20,5 @@ throws_ok {
$match->run;
} qr/^No codeblock to run/;
+done_testing;
+
commit 074101f4f457303ec1c132bcfee6833eaf8fc114
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Sun Oct 24 14:18:07 2010 +0900
Better dep list
diff --git a/Makefile.PL b/Makefile.PL
index 09787c5..d0f39d3 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -4,10 +4,11 @@ name 'Path-Dispatcher';
all_from 'lib/Path/Dispatcher.pm';
repository 'http://github.com/bestpractical/path-dispatcher';
-requires 'Any::Moose';
-requires 'Try::Tiny';
+requires 'Any::Moose' => '0.12';
+requires 'Try::Tiny' => '0.02';
-build_requires 'Test::Exception';
+test_requires 'Test::More' => '0.88';
+test_requires 'Test::Exception' => '0.27';
WriteAll;
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list