1 files changed, 49 insertions, 15 deletions

diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t
index 521497f3e..e369968b4 100644
--- a/t/app/controller/admin.t
+++ b/t/app/controller/admin.t
@@ -53,6 +53,7 @@ my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
         used_map           => 't',
         name               => 'Test User',
         anonymous          => 'f',
+        external_id        => '13',
         state              => 'confirmed',
         confirmed          => $dt->ymd . ' ' . $dt->hms,
         lang               => 'en-gb',
@@ -93,7 +94,11 @@ subtest 'check summary counts' => sub {
     my $alerts =  FixMyStreet::App->model('DB::Alert')->search( { confirmed => { '>' => 0 } } );
     my $a_count = $alerts->count;
 
-    $mech->get_ok('/admin');
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ 'fixmystreet' ],
+    }, sub {
+        $mech->get_ok('/admin');
+    };
 
     $mech->title_like(qr/Summary/);
 
@@ -105,10 +110,9 @@ subtest 'check summary counts' => sub {
 
     $mech->content_contains( "$q_count questionnaires sent" );
 
-    SKIP: {
-        skip( "Need 'barnet' in ALLOWED_COBRANDS config", 7 )
-            unless FixMyStreet::Cobrand->exists('barnet');
-
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ 'barnet' ],
+    }, sub {
         ok $mech->host('barnet.fixmystreet.com');
 
         $mech->get_ok('/admin');
@@ -137,19 +141,23 @@ subtest 'check summary counts' => sub {
 
         $alert->cobrand('');
         $alert->update;
-    }
+    };
 
     FixMyStreet::App->model('DB::Problem')->search( { bodies_str => 1 } )->update( { bodies_str => 2489 } );
     ok $mech->host('fixmystreet.com');
 };
 
-my $host = FixMyStreet->config('BASE_URL');
-
 my $body = $mech->create_body_ok(2650, 'Aberdeen City Council');
-$mech->get_ok('/admin/body/2650');
+FixMyStreet::override_config {
+    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_TYPES => [ 'UTA' ],
+    BASE_URL => 'http://www.example.org',
+}, sub {
+    $mech->get_ok('/admin/body/2650');
+};
 $mech->content_contains('Aberdeen City Council');
 $mech->content_like(qr{AB\d\d});
-$mech->content_contains("$host/around");
+$mech->content_contains("http://www.example.org/around");
 
 subtest 'check contact creation' => sub {
     my $contact = FixMyStreet::App->model('DB::Contact')->search(
@@ -555,7 +563,7 @@ foreach my $test (
         $report->discard_changes;
 
         if ( $report->state eq 'confirmed' ) {
-            $mech->content_contains( 'type="submit" name="resend"', 'no resend button' );
+            $mech->content_contains( 'type="submit" name="resend"', 'resend button' );
         } else {
             $mech->content_lacks( 'type="submit" name="resend"', 'no resend button' );
         }
@@ -1032,13 +1040,19 @@ subtest 'report search' => sub {
 
     $mech->content_contains( $report->title );
     my $r_id = $report->id;
-    $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id">$r_id</a>} );
+    $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id"[^>]*>$r_id</a>} );
+
+    $mech->get_ok('/admin/reports?search=' . $report->external_id);
+    $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id"[^>]*>$r_id</a>} );
+
+    $mech->get_ok('/admin/reports?search=ref:' . $report->external_id);
+    $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id"[^>]*>$r_id</a>} );
 
     $mech->get_ok('/admin/reports?search=' . $report->user->email);
 
     my $u_id = $update->id;
-    $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id">$r_id</a>} );
-    $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id#update_$u_id">$u_id</a>} );
+    $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id"[^>]*>$r_id</a>} );
+    $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id#update_$u_id"[^>]*>$u_id</a>} );
 
     $update->state('hidden');
     $update->update;
@@ -1056,7 +1070,7 @@ subtest 'report search' => sub {
     $report->update;
 
     $mech->get_ok('/admin/reports?search=' . $report->user->email);
-    $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id">$r_id</a>} );
+    $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id"[^>]*>$r_id</a>} );
 };
 
 subtest 'search abuse' => sub {
@@ -1205,6 +1219,26 @@ for my $test (
     };
 }
 
+subtest "Test setting a report from unconfirmed to something else doesn't cause a front end error" => sub {
+    $report->update( { confirmed => undef, state => 'unconfirmed', non_public => 0 } );
+    $mech->get_ok("/admin/report_edit/$report_id");
+    $mech->submit_form_ok( { with_fields => { state => 'investigating' } } );
+    $report->discard_changes;
+    ok( $report->confirmed, 'report has a confirmed timestamp' );
+    $mech->get_ok("/report/$report_id");
+};
+
+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),
+        (sprintf 'https://secure.mysociety.org/admin/bci/report_edit/%d', $report_id),
+        'get_admin_url OK');
+};
+
 $mech->delete_user( $user );
 $mech->delete_user( $user2 );
 $mech->delete_user( $user3 );