Auto-add strict/warnings/Test::More with TestMech.

9 files changed, 3 insertions, 40 deletions

diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index a7cc563dc..0a0ac5163 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -1,7 +1,3 @@
-use strict;
-use warnings;
-use Test::More;
-
 use CGI::Simple;
 use FixMyStreet::TestMech;
 my $mech = FixMyStreet::TestMech->new;
diff --git a/t/cobrand/closest.t b/t/cobrand/closest.t
index 8bb2d649b..a7d09842b 100644
--- a/t/cobrand/closest.t
+++ b/t/cobrand/closest.t
@@ -1,7 +1,3 @@
-use strict;
-use warnings;
-
-use Test::More;
 use t::Mock::Bing;
 
 use mySociety::Locale;
diff --git a/t/cobrand/councils.t b/t/cobrand/councils.t
index 0e8b71f04..4de8bbf2e 100644
--- a/t/cobrand/councils.t
+++ b/t/cobrand/councils.t
@@ -1,7 +1,3 @@
-use strict;
-use warnings;
-use Test::More;
-
 use FixMyStreet::TestMech;
 my $mech = FixMyStreet::TestMech->new;
 
diff --git a/t/cobrand/fixamingata.t b/t/cobrand/fixamingata.t
index d6a1c2b34..1ae637229 100644
--- a/t/cobrand/fixamingata.t
+++ b/t/cobrand/fixamingata.t
@@ -1,13 +1,5 @@
-use strict;
-use warnings;
-use Test::More;
 use Test::MockModule;
 
-BEGIN {
-    use FixMyStreet;
-    FixMyStreet->test_mode(1);
-}
-
 use mySociety::Locale;
 
 use FixMyStreet::TestMech;
diff --git a/t/cobrand/form_extras.t b/t/cobrand/form_extras.t
index 22a86ef21..e0727018f 100644
--- a/t/cobrand/form_extras.t
+++ b/t/cobrand/form_extras.t
@@ -1,6 +1,3 @@
-use strict;
-use warnings;
-
 package FixMyStreet::Cobrand::Tester;
 use parent 'FixMyStreet::Cobrand::FixMyStreet';
 
@@ -18,7 +15,6 @@ sub path_to_web_templates {
 
 package main;
 
-use Test::More;
 use FixMyStreet::TestMech;
 
 # disable info logs for this test run
diff --git a/t/cobrand/hart.t b/t/cobrand/hart.t
index f4a2473eb..d1681a537 100644
--- a/t/cobrand/hart.t
+++ b/t/cobrand/hart.t
@@ -1,7 +1,3 @@
-use strict;
-use warnings;
-use Test::More;
-
 use FixMyStreet::TestMech;
 my $mech = FixMyStreet::TestMech->new;
 
diff --git a/t/cobrand/oxfordshire.t b/t/cobrand/oxfordshire.t
index d5effacae..fad41be31 100644
--- a/t/cobrand/oxfordshire.t
+++ b/t/cobrand/oxfordshire.t
@@ -1,7 +1,3 @@
-use strict;
-use warnings;
-use Test::More;
-
 use FixMyStreet::TestMech;
 my $mech = FixMyStreet::TestMech->new;
 
@@ -61,7 +57,7 @@ subtest 'Exor RDI download appears on Oxfordshire cobrand admin' => sub {
     }
 };
 
-subtest 'Exor RDI download doesn’t appear outside of Oxfordshire cobrand admin' => sub {
+subtest "Exor RDI download doesn't appear outside of Oxfordshire cobrand admin" => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
     }, sub {
diff --git a/t/cobrand/restriction.t b/t/cobrand/restriction.t
index 873a396b7..4d15cdc48 100644
--- a/t/cobrand/restriction.t
+++ b/t/cobrand/restriction.t
@@ -17,7 +17,6 @@ sub updates_restriction {
 
 package main;
 
-use Test::More;
 use FixMyStreet::TestMech;
 
 my $c = FixMyStreet::App->new;
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index 0a84d2d03..947baaec8 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -1,15 +1,14 @@
 # TODO
 # Overdue alerts
 
-use strict;
-use warnings;
 use DateTime;
 use Email::MIME;
 use LWP::Protocol::PSGI;
-use Test::More;
 use Test::LongString;
 use Path::Tiny;
 use t::Mock::MapItZurich;
+use FixMyStreet::TestMech;
+my $mech = FixMyStreet::TestMech->new;
 
 # Check that you have the required locale installed - the following
 # should return a line with de_CH.utf8 in. If not install that locale.
@@ -53,9 +52,6 @@ sub reset_report_state {
     $report->update;
 }
 
-use FixMyStreet::TestMech;
-my $mech = FixMyStreet::TestMech->new;
-
 # Front page test
 ok $mech->host("zurich.example.com"), "change host to Zurich";
 FixMyStreet::override_config {