4 files changed, 69 insertions, 19 deletions

diff --git a/t/app/model/alert_type.t b/t/app/model/alert_type.t
index ac8013278..ae413978f 100644
--- a/t/app/model/alert_type.t
+++ b/t/app/model/alert_type.t
@@ -487,6 +487,31 @@ subtest "check local alerts from cobrand send main site url for alerts for diffe
     like $body, qr#$expected2#, 'cobrand area report point to cobrand url';
 };
 
+# Test that email alerts are sent in the right language.
+subtest "correct i18n-ed summary for state of closed" => sub {
+    $mech->clear_emails_ok;
+
+    $report->update( { state => 'closed' } );
+    $alert->update( { lang => 'nb', cobrand => 'fiksgatami' } );
+
+    FixMyStreet::App->model('DB::AlertSent')->search( {
+        alert_id => $alert->id,
+        parameter => $comment->id,
+    } )->delete;
+
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ 'fiksgatami' ],
+    }, sub {
+        FixMyStreet::App->model('DB::AlertType')->email_alerts();
+    };
+
+    $mech->email_count_is( 1 );
+    my $email = $mech->get_email;
+    my $body = $email->body;
+    my $msg = 'Denne rapporten er for tiden markert som lukket';
+    like $body, qr/$msg/, 'email says problem is closed, in Norwegian';
+};
+
 END {
     $mech->delete_user($user) if $user;
     $mech->delete_user($user2) if $user2;
diff --git a/t/cobrand/hart.t b/t/cobrand/hart.t
new file mode 100644
index 000000000..f4a2473eb
--- /dev/null
+++ b/t/cobrand/hart.t
@@ -0,0 +1,16 @@
+use strict;
+use warnings;
+use Test::More;
+
+use FixMyStreet::TestMech;
+my $mech = FixMyStreet::TestMech->new;
+
+FixMyStreet::override_config {
+    ALLOWED_COBRANDS => [ 'hart' ],
+}, sub {
+    ok $mech->host("hart.fixmystreet.com"), "change host to hart";
+    $mech->get_ok('/');
+    $mech->content_like( qr/Hart\b/ );
+};
+
+done_testing();
diff --git a/t/i18n.t b/t/i18n.t
index f1cc86985..3337f1a7f 100644
--- a/t/i18n.t
+++ b/t/i18n.t
@@ -3,15 +3,12 @@ use warnings;
 
 use Test::More;
 
-use FixMyStreet;
-use mySociety::Locale;
-use Encode;
-use Data::Dumper;
 use HTTP::Headers;
 use Sort::Key qw(keysort);
 use POSIX 'strcoll';
-local $Data::Dumper::Sortkeys = 1;
-use utf8;
+
+use FixMyStreet;
+use mySociety::Locale;
 
 # check that the mo files have been generated
 die "You need to run 'commonlib/bin/gettext-makemo --quiet FixMyStreet' "
@@ -59,10 +56,6 @@ my @EN_sorted      = qw( A Å Ø Z );
 my @NO_sorted      = qw( A Z Ø Å );
 my @default_sorted = qw( A Z Å Ø );
 
-sub utf8_diag {
-    diag encode_utf8( Dumper(@_) );
-}
-
 {
 
     mySociety::Locale::negotiate_language(    #
diff --git a/t/open311/getservicerequestupdates.t b/t/open311/getservicerequestupdates.t
index 4e10766d6..00c25a83e 100644
--- a/t/open311/getservicerequestupdates.t
+++ b/t/open311/getservicerequestupdates.t
@@ -627,10 +627,22 @@ foreach my $test ( {
 
 foreach my $test ( {
         desc => 'normally alerts are not suppressed',
+        num_alerts => 1,
         suppress_alerts => 0,
     },
     {
         desc => 'alerts suppressed if suppress_alerts set',
+        num_alerts => 1,
+        suppress_alerts => 1,
+    },
+    {
+        desc => 'alert suppression ok even if no alerts',
+        num_alerts => 0,
+        suppress_alerts => 1,
+    },
+    {
+        desc => 'alert suppression ok even if 2x alerts',
+        num_alerts => 2,
         suppress_alerts => 1,
     }
 ) {
@@ -652,12 +664,14 @@ foreach my $test ( {
         $problem->lastupdate( $dt->subtract( hours => 3 ) );
         $problem->update;
 
-        my $alert = FixMyStreet::App->model('DB::Alert')->find_or_create( {
-            alert_type => 'new_updates',
-            parameter  => $problem->id,
-            confirmed  => 1,
-            user_id    => $problem->user->id,
-        } );
+        my @alerts = map {
+            my $alert = FixMyStreet::App->model('DB::Alert')->create( {
+                alert_type => 'new_updates',
+                parameter  => $problem->id,
+                confirmed  => 1,
+                user_id    => $problem->user->id,
+            } )
+        } (1..$test->{num_alerts});
 
         $requests_xml =~ s/UPDATED_DATETIME/$dt/;
 
@@ -674,19 +688,21 @@ foreach my $test ( {
 
         my $alerts_sent = FixMyStreet::App->model('DB::AlertSent')->search(
             {
-                alert_id => $alert->id,
+                alert_id => [ map $_->id, @alerts ],
                 parameter => $problem->comments->first->id,
             }
         );
 
         if ( $test->{suppress_alerts} ) {
-            ok $alerts_sent->count(), 'alerts suppressed';
+            is $alerts_sent->count(), $test->{num_alerts}, 'alerts suppressed';
         } else {
             is $alerts_sent->count(), 0, 'alerts not suppressed';
         }
 
         $alerts_sent->delete;
-        $alert->delete;
+        for my $alert (@alerts) {
+            $alert->delete;
+        }
     }
 }