Skip to content

Commit 9e2f1bb

Browse files
committed
Revert "Merge pull request xsawyerx#48 from chrestomanci/Fix_create_t_Plugin_breakage"
This reverts commit e8f97af, reversing changes made to 8fe92f1.
1 parent 7b7c894 commit 9e2f1bb

File tree

1 file changed

+5
-35
lines changed

1 file changed

+5
-35
lines changed

lib/Module/Starter/Simple.pm

+5-35
Original file line numberDiff line numberDiff line change
@@ -1080,12 +1080,11 @@ sub create_t {
10801080
my $self = shift;
10811081
my @modules = @_;
10821082

1083-
my %t_files = $self->t_guts(@modules);
1084-
my %xt_files = $self->xt_guts(@modules);
1083+
my ($t_files, $xt_files) = $self->t_guts(@modules);
10851084

10861085
my @files;
1087-
push @files, map { $self->_create_t('t', $_, $t_files{$_}) } keys %t_files;
1088-
push @files, map { $self->_create_t('xt', $_, $xt_files{$_}) } keys %xt_files;
1086+
push @files, map { $self->_create_t('t', $_, $t_files->{$_}) } keys %$t_files;
1087+
push @files, map { $self->_create_t('xt', $_, $xt_files->{$_}) } keys %$xt_files;
10891088

10901089
return @files;
10911090
}
@@ -1105,6 +1104,7 @@ sub t_guts {
11051104
my @modules = @_;
11061105

11071106
my %t_files;
1107+
my %xt_files;
11081108
my $minperl = $self->{minperl};
11091109
my $warnings = sprintf 'warnings%s;', ($self->{fatalize} ? " FATAL => 'all" : '');
11101110

@@ -1179,36 +1179,6 @@ $use_lines
11791179
diag( "Testing $main_module \$${main_module}::VERSION, Perl \$], \$^X" );
11801180
HERE
11811181

1182-
return %t_files;
1183-
}
1184-
1185-
=head2 xt_guts( @modules )
1186-
1187-
This method is called by create_t, and returns a description of the author
1188-
only *.t files to be created in the xt directory.
1189-
1190-
The return value is a hash of test files to create. Each key is a filename and
1191-
each value is the contents of that file.
1192-
1193-
=cut
1194-
1195-
sub xt_guts {
1196-
my $self = shift;
1197-
my @modules = @_;
1198-
1199-
my %xt_files;
1200-
my $minperl = $self->{minperl};
1201-
my $warnings = sprintf 'warnings%s;', ($self->{fatalize} ? " FATAL => 'all" : '');
1202-
1203-
my $header = <<"EOH";
1204-
#!perl -T
1205-
use $minperl;
1206-
use strict;
1207-
use $warnings
1208-
use Test::More;
1209-
1210-
EOH
1211-
12121182
my $module_boilerplate_tests;
12131183
$module_boilerplate_tests .=
12141184
" module_boilerplate_ok('".$self->_module_to_pm_file($_)."');\n" for @modules;
@@ -1267,7 +1237,7 @@ $module_boilerplate_tests
12671237
12681238
HERE
12691239

1270-
return %xt_files;
1240+
return( \%t_files, \%xt_files );
12711241
}
12721242

12731243
sub _create_t {

0 commit comments

Comments
 (0)