Merge tag 'v1.8.1' into fiksgatami-dev

1 files changed, 5 insertions, 14 deletions

diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t
index e2dd5df19..92cbbc00f 100644
--- a/t/app/controller/admin.t
+++ b/t/app/controller/admin.t
@@ -6,18 +6,11 @@ use FixMyStreet::TestMech;
 
 my $mech = FixMyStreet::TestMech->new;
 
-my $secret = FixMyStreet::App->model('DB::Secret')->search();
-
-# don't explode if there's nothing in the secret table
-if ( $secret == 0 ) {
-    diag "You need to put an entry in the secret table for the admin tests to run";
-    plan skip_all => 'No entry in secret table';
-}
-
 my $user =
   FixMyStreet::App->model('DB::User')
-  ->find_or_create( { email => 'test@example.com', name => 'Test User' } );
+  ->find_or_create( { email => 'test@example.com' } );
 ok $user, "created test user";
+$user->update({ name => 'Test User' });
 
 my $user2 =
   FixMyStreet::App->model('DB::User')
@@ -70,8 +63,8 @@ my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
 
 my $alert = FixMyStreet::App->model('DB::Alert')->find_or_create(
     {
-        alert_type => 'new_updates',
-        parameter => $report->id,
+        alert_type => 'area_problems',
+        parameter => 2482,
         confirmed => 1,
         user => $user,
     },
@@ -1240,9 +1233,7 @@ subtest "Check admin_base_url" => sub {
     my $rs = FixMyStreet::App->model('DB::Problem');
     my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker($report->cobrand)->new();
 
-    is (FixMyStreet::App->model('DB::Problem')->get_admin_url(
-            $cobrand,
-            $report),
+    is ($report->admin_url($cobrand),
         (sprintf 'https://secure.mysociety.org/admin/bci/report_edit/%d', $report_id),
         'get_admin_url OK');
 };