initial split into t/funcs.pm

t/funcs.pm

@@ -0,0 +1,51 @@
+use strict;
+use warnings;
+
+use autodie 'system';
+use IPC::System::Simple (); # for autodie && prereqs
+
+use File::chdir;
+use Path::Class;
+
+sub make_test_repo {
+    my @commands = @_;
+
+    my $tempdir = tempdir;
+    my $repo_root = dir($tempdir)->absolute;
+    note "Repo being created at $repo_root";
+    local $CWD = "$repo_root";
+
+    unshift @commands, 'git init'
+        unless $commands[0] =~ /git init/;
+
+    system "($_) 2> /dev/null > /dev/null" for @commands;
+
+    return $repo_root;
+}
+
+sub _ack {
+    my ($fn, $text) = @_;
+    $text ||= 'whee';
+
+    return (
+        qq{echo "$text" >> $fn},
+        qq{git add $fn && git commit -m "ack"},
+    );
+}
+
+# blatantly stolen from Dist-Zilla-Plugin-CheckPrereqsIndexed-0.008/t/basic.t
+# Write the log messages as diagnostics:
+sub diag_log
+{
+  my $tzil = shift;
+
+  # Output nothing if all tests passed:
+  my $all_passed = shift;
+  $all_passed &&= $_ for @_;
+
+  return if $all_passed;
+
+  diag(map { "$_\n" } @{ $tzil->log_messages });
+}
+
+!!42;

t/plugin/correct_branch.t

@@ -1,17 +1,13 @@
 use strict;
 use warnings;
 
-use autodie 'system';
-use IPC::System::Simple (); # for autodie && prereqs
-
-use File::chdir;
-use Path::Class;
-
 use Test::More;
 use Test::Fatal;
 use Test::Moose::More 0.004;
 use Test::TempDir;
 
+require 't/funcs.pm' unless eval { require funcs };
+
 use Dist::Zilla::Plugin::Git::CheckFor::CorrectBranch;
 
 my $THING = 'Dist::Zilla::Plugin::Git::CheckFor::CorrectBranch';
@@ -29,47 +25,6 @@ validate_class $THING => (
 
 use Test::DZil;
 
-sub make_test_repo {
-    my @commands = @_;
-
-    my $tempdir = tempdir;
-    my $repo_root = dir($tempdir)->absolute;
-    note "Repo being created at $repo_root";
-    local $CWD = "$repo_root";
-
-    unshift @commands, 'git init'
-        unless $commands[0] =~ /git init/;
-
-    system "($_) 2> /dev/null > /dev/null" for @commands;
-
-    return $repo_root;
-}
-
-sub _ack {
-    my ($fn, $text) = @_;
-    $text ||= 'whee';
-
-    return (
-        qq{echo "$text" >> $fn},
-        qq{git add $fn && git commit -m "ack"},
-    );
-}
-
-# blatantly stolen from Dist-Zilla-Plugin-CheckPrereqsIndexed-0.008/t/basic.t
-# Write the log messages as diagnostics:
-sub diag_log
-{
-  my $tzil = shift;
-
-  # Output nothing if all tests passed:
-  my $all_passed = shift;
-  $all_passed &&= $_ for @_;
-
-  return if $all_passed;
-
-  diag(map { "$_\n" } @{ $tzil->log_messages });
-}
-
 subtest 'simple repo, on wrong, divergent branch' => sub {
 
     # make some basic commits, branch...