members on hiatus are still part of the core team, but do not affect …

…majority votes
mojolicious · Feb 3, 2017 · b032df3 · b032df3
1 parent f48e67a
commit b032df3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,5 @@
 
-7.24  2017-01-30
+7.24  2017-02-03
 
 7.23  2017-01-29
   - Added max_request_size attribute to Mojolicious.

diff --git a/lib/Mojo/File.pm b/lib/Mojo/File.pm
@@ -283,8 +283,8 @@ Include hidden files and directories.
   $path = $path->make_path;
   $path = $path->make_path({mode => 0711});
 
-Create the directories if they don't already exist with L<File::Path>. Any
-additional arguments are passed through unmodified to L<File::Path::make_path>.
+Create the directories if they don't already exist, any additional arguments are
+passed through to L<File::Path>.
 
 =head2 move_to
 
@@ -310,9 +310,8 @@ directory.
   $path = $path->remove_tree;
   $path = $path->remove_tree({keep_root => 1});
 
-Delete this directory and any files and subdirectories it may contain with
-L<File::Path>.  Any additional arguments are passed through unmodified to
-L<File::Path::remove_tree>.
+Delete this directory and any files and subdirectories it may contain, any
+additional arguments are passed through to L<File::Path>.
 
 =head2 slurp
 

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -791,10 +791,6 @@ Current members of the core team in alphabetical order:
 
 =over 2
 
-Abhijit Menon-Sen, C<ams@cpan.org>
-
-Glen Hinkle, C<tempire@cpan.org>
-
 Jan Henning Thorsen, C<jhthorsen@cpan.org>
 
 Joel Berger, C<jberger@cpan.org>
@@ -803,6 +799,16 @@ Marcus Ramberg, C<mramberg@cpan.org>
 
 =back
 
+The following members of the core team are currently on hiatus:
+
+=over 2
+
+Abhijit Menon-Sen, C<ams@cpan.org>
+
+Glen Hinkle, C<tempire@cpan.org>
+
+=back
+
 =head1 CREDITS
 
 In alphabetical order:

diff --git a/t/mojo/file.t b/t/mojo/file.t
@@ -72,17 +72,18 @@ $subdir->make_path;
 ok -d $subdir, 'directory exists';
 my $nextdir = $dir->child('foo', 'foobar')->make_path({error => \my $error});
 ok -d $nextdir, 'directory exists';
-isa_ok $error, 'ARRAY', 'make_path modified variable';
+ok $error, 'directory already existed';
 
 # Remove tree
 $dir = tempdir;
 $dir->child('foo', 'bar')->make_path->child('test.txt')->spurt('test!');
 is $dir->child('foo', 'bar', 'test.txt')->slurp, 'test!', 'right content';
 $subdir = $dir->child('foo', 'foobar')->make_path;
-ok -e $subdir->child('bar')->make_path->child('a.out')->spurt('ELF'), 'created';
-ok -d $subdir->remove_tree({keep_root => 1}), 'arg passed through and dir kept';
-ok !-e $subdir->child('bar'), 'sub tree has been removed';
-ok !-e $dir->child('foo')->remove_tree->to_string, 'tree has been removed';
+ok -e $subdir->child('bar')->make_path->child('test.txt')->spurt('test'),
+  'file created';
+ok -d $subdir->remove_tree({keep_root => 1}), 'directory still exists';
+ok !-e $subdir->child('bar'), 'children have been removed';
+ok !-e $dir->child('foo')->remove_tree->to_string, 'directory has been removed';
 
 # Move to
 $dir = tempdir;