1 files changed, 10 insertions, 8 deletions

diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t
index 115bb181a..ac2ec20ac 100644
--- a/t/app/controller/alert_new.t
+++ b/t/app/controller/alert_new.t
@@ -132,7 +132,7 @@ foreach my $test (
         ok $token->data->{id} == $existing_id, 'subscribed to existing alert';
 
         $mech->get_ok("/A/$url_token");
-        $mech->content_contains('successfully confirmed');
+        $mech->content_contains('alert created');
 
         $alert =
           FixMyStreet::App->model('DB::Alert')->find( { id => $existing_id, } );
@@ -370,9 +370,9 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
             my ( $url, $url_token ) = $email->body =~ m{http://\S+(/A/(\S+))};
             my $token = FixMyStreet::App->model('DB::Token')->find( { token => $url_token, scope => 'alert' } );
             $mech->get_ok( $url );
-            $mech->content_contains('successfully confirmed');
+            $mech->content_contains('alert created');
         } else {
-            $mech->content_contains('successfully created');
+            $mech->content_contains('alert created');
         }
     }
 
@@ -451,7 +451,7 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
     my $count;
     for (@emails) {
         $count++ if $_->body =~ /The following updates have been left on this report:/;
-        $count++ if $_->body =~ /The following new FixMyStreet reports have been added in City of\s+Edinburgh\s+Council:/;
+        $count++ if $_->body =~ /The following new FixMyStreet reports have been added in the City of\s+Edinburgh\s+Council area:/;
         $count++ if $_->body =~ /The following FixMyStreet reports have been made within the area you\s+specified:/;
         $count++ if $_->body =~ /\s+-\s+Testing/;
     }
@@ -461,19 +461,21 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
     like $email->body, qr/Other User/, 'Update name given';
     unlike $email->body, qr/Anonymous User/, 'Update name not given';
 
-    # The update alert was to the problem reporter, so has a login update URL
+    # The update alert was to the problem reporter, so has a special update URL
+    $mech->log_out_ok;
     $mech->get_ok( "/report/$report_id" );
     $mech->content_lacks( 'has not been fixed' );
-    my ($url) = $email->body =~ m{(http://\S+/M/\S+)};
+    my ($url) = $email->body =~ m{(http://\S+/R/\S+)};
     ok $url, "extracted update url '$url'";
     $mech->get_ok( $url );
     is $mech->uri->path, "/report/" . $report_id, "redirected to report page";
     $mech->content_contains( 'has not been fixed' );
-    $mech->logged_in_ok;
+    $mech->not_logged_in_ok;
 
     ($url) = $emails[0]->body =~ m{http://\S+(/A/\S+)};
     $mech->get_ok( $url );
-    $mech->content_contains('successfully deleted');
+    $mech->content_contains('alert deleted');
+    $mech->not_logged_in_ok;
 
     $mech->delete_user($user1);
     $mech->delete_user($user2);