Merge branch 'move-report-states-to-database-part-1'

10 files changed, 4 insertions, 20 deletions

diff --git a/t/Mock/MapItZurich.pm b/t/Mock/MapItZurich.pm
index f7bcda31d..f7fd61a32 100644
--- a/t/Mock/MapItZurich.pm
+++ b/t/Mock/MapItZurich.pm
@@ -3,8 +3,6 @@ package t::Mock::MapItZurich;
 use JSON::MaybeXS;
 use Web::Simple;
 
-use mySociety::Locale;
-
 has json => (
     is => 'lazy',
     default => sub {
diff --git a/t/app/controller/admin_reportextrafields.t b/t/app/controller/admin_reportextrafields.t
index 4c706687a..fb06665f4 100644
--- a/t/app/controller/admin_reportextrafields.t
+++ b/t/app/controller/admin_reportextrafields.t
@@ -31,6 +31,10 @@ package main;
 
 use FixMyStreet::TestMech;
 
+# disable info logs for this test run
+FixMyStreet::App->log->disable('info');
+END { FixMyStreet::App->log->enable('info'); }
+
 my $mech = FixMyStreet::TestMech->new;
 
 my $user = $mech->create_user_ok('superuser@example.com', name => 'Super User', is_superuser => 1);
diff --git a/t/app/model/alert_type.t b/t/app/model/alert_type.t
index eab4ec614..c978b5ccf 100644
--- a/t/app/model/alert_type.t
+++ b/t/app/model/alert_type.t
@@ -1,7 +1,5 @@
 use FixMyStreet::TestMech;
 
-mySociety::Locale::gettext_domain( 'FixMyStreet' );
-
 my $mech = FixMyStreet::TestMech->new();
 
 # this is the easiest way to make sure we're not going
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index b0719d6a6..efc9057da 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -2,11 +2,8 @@ use FixMyStreet::TestMech;
 use FixMyStreet;
 use FixMyStreet::App;
 use FixMyStreet::DB;
-use mySociety::Locale;
 use Sub::Override;
 
-mySociety::Locale::gettext_domain('FixMyStreet');
-
 my $problem_rs = FixMyStreet::DB->resultset('Problem');
 
 my $problem = $problem_rs->new(
diff --git a/t/app/script/archive_old_enquiries.t b/t/app/script/archive_old_enquiries.t
index fb1949d9f..e1adeec85 100644
--- a/t/app/script/archive_old_enquiries.t
+++ b/t/app/script/archive_old_enquiries.t
@@ -1,8 +1,6 @@
 use FixMyStreet::TestMech;
 use FixMyStreet::Script::ArchiveOldEnquiries;
 
-mySociety::Locale::gettext_domain( 'FixMyStreet' );
-
 my $mech = FixMyStreet::TestMech->new();
 
 $mech->clear_emails_ok;
diff --git a/t/app/sendreport/email.t b/t/app/sendreport/email.t
index 718b0a495..6b292725b 100644
--- a/t/app/sendreport/email.t
+++ b/t/app/sendreport/email.t
@@ -2,7 +2,6 @@ use FixMyStreet;
 use FixMyStreet::DB;
 use FixMyStreet::SendReport::Email;
 use FixMyStreet::TestMech;
-use mySociety::Locale;
 
 ok( my $mech = FixMyStreet::TestMech->new, 'Created mech object' );
 
diff --git a/t/app/sendreport/inspection_required.t b/t/app/sendreport/inspection_required.t
index 684395bac..73bdd14f7 100644
--- a/t/app/sendreport/inspection_required.t
+++ b/t/app/sendreport/inspection_required.t
@@ -2,7 +2,6 @@ use FixMyStreet;
 use FixMyStreet::DB;
 use FixMyStreet::TestMech;
 use FixMyStreet::SendReport::Email;
-use mySociety::Locale;
 
 ok( my $mech = FixMyStreet::TestMech->new, 'Created mech object' );
 
diff --git a/t/cobrand/closest.t b/t/cobrand/closest.t
index 088349f39..36fe78a01 100644
--- a/t/cobrand/closest.t
+++ b/t/cobrand/closest.t
@@ -1,6 +1,5 @@
 use t::Mock::Bing;
 
-use mySociety::Locale;
 use FixMyStreet::DB;
 use FixMyStreet::TestMech;
 
@@ -8,8 +7,6 @@ my $mech = FixMyStreet::TestMech->new;
 
 use_ok 'FixMyStreet::Cobrand';
 
-mySociety::Locale::gettext_domain( 'FixMyStreet' );
-
 my $c = FixMyStreet::Cobrand::UK->new();
 
 my $user =
diff --git a/t/cobrand/get_body_sender.t b/t/cobrand/get_body_sender.t
index a53472128..06ffb42a5 100644
--- a/t/cobrand/get_body_sender.t
+++ b/t/cobrand/get_body_sender.t
@@ -1,12 +1,9 @@
 use FixMyStreet::Test;
 
-use mySociety::Locale;
 use FixMyStreet::DB;
 
 use_ok 'FixMyStreet::Cobrand';
 
-mySociety::Locale::gettext_domain( 'FixMyStreet' );
-
 my $c = FixMyStreet::Cobrand::FixMyStreet->new();
 
 FixMyStreet::DB->resultset('BodyArea')->search( { body_id => 1000 } )->delete;
diff --git a/t/map/tilma/original.t b/t/map/tilma/original.t
index 4766e9363..b29155bee 100644
--- a/t/map/tilma/original.t
+++ b/t/map/tilma/original.t
@@ -2,14 +2,11 @@ use FixMyStreet::DB;
 use FixMyStreet::Map;
 use FixMyStreet::TestMech;
 use DateTime;
-use mySociety::Locale;
 
 use Catalyst::Test 'FixMyStreet::App';
 
 my $mech = FixMyStreet::TestMech->new;
 
-mySociety::Locale::gettext_domain('FixMyStreet');
-
 FixMyStreet::Map::set_map_class();
 my $c = ctx_request('http://fixmystreet.com/test?bbox=-7.6,49.7,-7.5,49.8');