From 495c00a71e8937eb9fd6f85657c8b7d097f1dfba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20Sim=C3=B5es?= Date: Fri, 9 Dec 2011 10:09:17 -0600 Subject: add dzil plugins, use File::Spec exclusively instead of regular expressions --- t/00-load.t | 7 ------- t/01-main.t | 13 ++++++------- t/02-app.t | 28 ++++++++++------------------ t/index.tx | 3 --- t/index.xslate | 5 ----- t/lib/TestApp.pm | 22 ++++++++++++++++++++++ t/views/index.tx | 3 +++ t/views/index.xslate | 5 +++++ 8 files changed, 46 insertions(+), 40 deletions(-) delete mode 100644 t/00-load.t delete mode 100644 t/index.tx delete mode 100644 t/index.xslate create mode 100644 t/lib/TestApp.pm create mode 100644 t/views/index.tx create mode 100644 t/views/index.xslate (limited to 't') diff --git a/t/00-load.t b/t/00-load.t deleted file mode 100644 index d4ef20b..0000000 --- a/t/00-load.t +++ /dev/null @@ -1,7 +0,0 @@ -use strict; -use warnings; -use Test::More tests => 1; - -BEGIN { - use_ok( 'Dancer::Template::Xslate' ) || print "Bail out!"; -} diff --git a/t/01-main.t b/t/01-main.t index 97682ed..c0961e3 100644 --- a/t/01-main.t +++ b/t/01-main.t @@ -1,16 +1,15 @@ use strict; use warnings; use Test::More tests => 2; -use Dancer::FileUtils 'path'; +use File::Spec::Functions qw(catfile); use Dancer::Template::Xslate; -my $engine; -eval { $engine = Dancer::Template::Xslate->new }; -is $@, '', - "Dancer::Template::Xslate engine created"; - -my $template = path('t', 'index.xslate'); +ok( + my $engine = Dancer::Template::Xslate->new, + "Dancer::Template::Xslate engine created" +); +my $template = catfile(qw(t views index.xslate)); my $result = $engine->render( $template, diff --git a/t/02-app.t b/t/02-app.t index 40d0d27..737008e 100644 --- a/t/02-app.t +++ b/t/02-app.t @@ -1,20 +1,12 @@ use strict; use warnings; -use Test::More import => ["!pass"]; - -use Dancer ':syntax'; -use Dancer::Test; - -plan tests => 3; - -setting views => 't'; -setting template => 'xslate'; - -ok( - get '/' => sub { - template 'index', { loop => [1..2] }; - } -); - -route_exists [ GET => '/' ]; -response_content_like( [ GET => '/' ], qr/1
\n2/ ); +use Test::More tests => 2; +use File::Spec; + +{ + use Dancer::Test; + use lib File::Spec->catdir(qw(t lib)); + use TestApp; + route_exists [ GET => '/' ]; + response_content_like( [ GET => '/' ], qr/1
\n2/ ); +} diff --git a/t/index.tx b/t/index.tx deleted file mode 100644 index 8ecc8e1..0000000 --- a/t/index.tx +++ /dev/null @@ -1,3 +0,0 @@ -:for $loop -> $i { -<: $i :>
-:} diff --git a/t/index.xslate b/t/index.xslate deleted file mode 100644 index 7ec6233..0000000 --- a/t/index.xslate +++ /dev/null @@ -1,5 +0,0 @@ -this is var1="<: $var1 :>" and var2=<: $var2 :> - -another line - -<: $foo :> <: $bar :> <: $baz :> diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm new file mode 100644 index 0000000..32b7255 --- /dev/null +++ b/t/lib/TestApp.pm @@ -0,0 +1,22 @@ +package +TestApp; + +use strict; +use warnings; +use Dancer ':syntax'; +use File::Spec::Functions qw(catdir); + +set views => catdir qw(t views); +set engines => { + xslate => { + cache => 0, + extension => 'tx', + }, +}; +set template => 'xslate'; +set logger => 'console'; +set log => 'warning'; + +get '/' => sub { return template 'index', { loop => [1, 2] } }; + +true; diff --git a/t/views/index.tx b/t/views/index.tx new file mode 100644 index 0000000..8ecc8e1 --- /dev/null +++ b/t/views/index.tx @@ -0,0 +1,3 @@ +:for $loop -> $i { +<: $i :>
+:} diff --git a/t/views/index.xslate b/t/views/index.xslate new file mode 100644 index 0000000..7ec6233 --- /dev/null +++ b/t/views/index.xslate @@ -0,0 +1,5 @@ +this is var1="<: $var1 :>" and var2=<: $var2 :> + +another line + +<: $foo :> <: $bar :> <: $baz :> -- cgit v1.2.3