Merge tag 'v2.2' into fiksgatami-dev

1 files changed, 12 insertions, 12 deletions

diff --git a/perllib/FixMyStreet/TestAppProve.pm b/perllib/FixMyStreet/TestAppProve.pm
index 5298d225f..7a387547d 100644
--- a/perllib/FixMyStreet/TestAppProve.pm
+++ b/perllib/FixMyStreet/TestAppProve.pm
@@ -21,7 +21,7 @@ see bin/run-tests for usage
 =cut
 
 sub cleanup {
-    unlink "conf/general.test-autogenerated.$$.yml";
+    unlink "conf/general-test-autogenerated.$$.yml";
 }
 
 sub signal_handler {
@@ -75,7 +75,7 @@ sub run {
         $SIG{__WARN__} =
           sub { print STDERR @_ if $_[0] !~ m/NOTICE:  CREATE TABLE/; };
         $dbh->do( path('db/schema.sql')->slurp ) or die $!;
-        $dbh->do( path('db/alert_types.sql')->slurp ) or die $!;
+        $dbh->do( path('db/fixture.sql')->slurp ) or die $!;
         $dbh->do( path('db/generate_secret.sql')->slurp ) or die $!;
         $SIG{__WARN__} = $tmpwarn;
 
@@ -86,23 +86,23 @@ sub run {
         $config->{FMS_DB_PASS} = '';
     }
 
-    my $config_out = "general.test-autogenerated.$$";
+    my $config_out = "general-test-autogenerated.$$";
     path("conf/$config_out.yml")->spew( YAML::Dump($config) );
 
     local $ENV{FMS_OVERRIDE_CONFIG} = $config_out;
 
-    # If no arguments, test everything
-    unshift @ARGV, 't' unless @ARGV;
+    my $prove = App::Prove->new;
+    $prove->process_args(@ARGV);
 
+    # If no arguments, test everything
+    $prove->argv(['t']) unless @{$prove->argv};
     # verbose if we have a single file
-    unshift @ARGV, '--verbose' if @ARGV and -f $ARGV[-1];
+    $prove->verbose(1) if @{$prove->argv} and -f $prove->argv->[-1];
+    # we always want to recurse
+    $prove->recurse(1);
+    # we always want to save state
+    $prove->state([ @state, 'save' ]);
 
-    unshift @ARGV,
-        '--recurse',                             # we always want to recurse
-        '--state', (join ',' => @state, 'save'); # we always want to save state
-
-    my $prove = App::Prove->new;
-    $prove->process_args(@ARGV);
     $prove->run;
 }