better Mojolicious::Plugin::Config tests

mojolicious · Apr 7, 2012 · a9fd79a · a9fd79a
1 parent 77165e7
commit a9fd79a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/Changes b/Changes
@@ -2,6 +2,7 @@ This file documents the revision history for Perl extension Mojolicious.
 
 2.77  2012-04-08
   - Improved documentation. (tempire, sri)
+  - Improved tests.
   - Fixed small bug that prevented non-string secrets in Mojolicious.
 
 2.76  2012-04-05

diff --git a/lib/Mojolicious/Plugin/Config.pm b/lib/Mojolicious/Plugin/Config.pm
@@ -121,9 +121,9 @@ Mojolicious::Plugin::Config - Perl-ish configuration plugin
 =head1 DESCRIPTION
 
 L<Mojolicious::Plugin::Config> is a Perl-ish configuration plugin. The
-application object can be accessed via the C<app> helper. You can extend the
-normal configuration file C<myapp.conf> with C<mode> specific ones like
-C<myapp.$mode.conf>.
+application object can be accessed via C<$app> or the C<app> function. You
+can extend the normal configuration file C<myapp.conf> with C<mode> specific
+ones like C<myapp.$mode.conf>.
 
 =head1 OPTIONS
 

diff --git a/t/mojolicious/embedded_lite_app.t b/t/mojolicious/embedded_lite_app.t
@@ -188,7 +188,7 @@ $t->get_ok('/just/works/too')->status_is(200)->content_is("It just works!\n");
 
 # GET /x/1/ (full external application)
 $t->get_ok('/x/1/')->status_is(200)->content_is(<<'EOF');
-works!
+works!Insecure!Insecure!
 
 too!works!!!
 <form action="/x/1/%E2%98%83">
@@ -212,7 +212,7 @@ $t->get_ok('/x/1/url/☃')->status_is(200)
 
 # GET /x/♥/ (full external application)
 $t->get_ok('/x/♥/')->status_is(200)->content_is(<<'EOF');
-works!
+works!Insecure!Insecure!
 
 too!works!!!
 <form action="/x/%E2%99%A5/%E2%98%83">
@@ -241,7 +241,7 @@ $t->get_ok('/host')->status_is(200)->content_is('main application!');
 # GET / (full external application with domain)
 $t->get_ok('/' => {Host => 'mojolicious.org'})->status_is(200)
   ->content_is(<<'EOF');
-works!
+works!Insecure!Insecure!
 
 too!works!!!
 <form action="/%E2%98%83">
@@ -256,7 +256,7 @@ $t->get_ok('/host' => {Host => 'mojolicious.org'})->status_is(200)
 # GET / (full external application with domain)
 $t->get_ok('/' => {Host => 'mojolicio.us'})->status_is(200)
   ->content_is(<<'EOF');
-works!
+works!Insecure!Insecure!
 
 too!works!!!
 <form action="/%E2%98%83">
@@ -270,7 +270,7 @@ $t->get_ok('/host' => {Host => 'mojolicio.us'})->status_is(200)
 
 # GET / (full external application with domain)
 $t->get_ok('/' => {Host => 'kraih.com'})->status_is(200)->content_is(<<'EOF');
-works!
+works!Insecure!Insecure!
 
 too!works!!!
 <form action="/%E2%98%83">
@@ -293,7 +293,7 @@ $t->get_ok('/host' => {Host => 'foo.bar.kraih.com'})->status_is(200)
 # GET /♥/123/host (full external application with a bit of everything)
 $t->get_ok('/♥/123/' => {Host => 'foo-bar.de'})->status_is(200)
   ->content_is(<<'EOF');
-works!
+works!Insecure!Insecure!
 
 too!works!!!
 <form action="/%E2%99%A5/123/%E2%98%83">

diff --git a/t/mojolicious/external/myapp.pl b/t/mojolicious/external/myapp.pl
@@ -5,6 +5,9 @@
 # "Boy, who knew a cooler could also make a handy wang coffin?"
 use Mojolicious::Lite;
 
+# Secret for config file tests
+app->secret('Insecure!');
+
 # Load plugin
 plugin 'Config';
 
@@ -45,4 +48,4 @@
 __DATA__
 
 @@ menubar.html.ep
-<%= $config->{just} %>
+<%= $config->{just} %><%= $config->{one} %><%= $config->{two} %>
diff --git a/t/mojolicious/external/myapp.testing.conf b/t/mojolicious/external/myapp.testing.conf
@@ -1 +1 @@
-{works => "too!"};
+{one => app->secret, two => $app->secret, works => "too!"};
diff --git a/t/mojolicious/external_lite_app.t b/t/mojolicious/external_lite_app.t
@@ -21,7 +21,7 @@ my $t = Test::Mojo->new;
 
 # GET /
 $t->get_ok('/')->status_is(200)->content_is(<<'EOF');
-works!
+works!Insecure!Insecure!
 
 too!works!!!
 <form action="/%E2%98%83">