release preparations

mojolicious · May 27, 2015 · 4ea1fa4 · 4ea1fa4
1 parent 5ba810f
commit 4ea1fa4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,6 @@
 
 6.12  2015-05-27
+  - Added TO_JSON method to Mojo::Collection. (wttw)
 
 6.11  2015-05-16
   - Deprecated Mojo::Content::build_body and Mojo::Content::build_headers.

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -995,6 +995,8 @@ Steffen Ullrich
 
 Stephane Este-Gracias
 
+Steve Atkins
+
 Tatsuhiko Miyagawa
 
 Terrence Brannon

diff --git a/t/mojo/collection.t b/t/mojo/collection.t
@@ -155,9 +155,7 @@ is_deeply $collection->uniq->to_array, [1, 2, 3, 4, 5], 'right result';
 is_deeply $collection->uniq->reverse->uniq->to_array, [5, 4, 3, 2, 1],
   'right result';
 
-# json
-$collection = c(1, 2, 3);
-my $bytes = encode_json $collection;
-is $bytes, '[1,2,3]', 'TO_JSON';
+# TO_JSON
+is encode_json(c(1, 2, 3)), '[1,2,3]', 'right result';
 
 done_testing();