Removal old Southampton/Reading/Lichfield cobrands.

2 files changed, 19 insertions, 19 deletions

diff --git a/t/app/model/alert_type.t b/t/app/model/alert_type.t
index ae413978f..5b7494a04 100644
--- a/t/app/model/alert_type.t
+++ b/t/app/model/alert_type.t
@@ -348,7 +348,7 @@ my $ward_alert = FixMyStreet::App->model('DB::Alert')->find_or_create(
         alert_type => 'area_problems',
         whensubscribed => $dt->ymd . ' ' . $dt->hms,
         confirmed => 1,
-        cobrand => 'lichfielddc',
+        cobrand => 'hart',
     }
 );
 
@@ -444,7 +444,7 @@ subtest "check alerts from cobrand send main site url for alerts for different c
 
     my $expected1 = mySociety::Config::get('BASE_URL') . '/report/' . $report_to_county_council->id;
     my $expected3 = mySociety::Config::get('BASE_URL') . '/report/' . $report_outside_district->id;
-    my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker('lichfielddc')->new();
+    my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker('hart')->new();
     my $expected2 = $cobrand->base_url . '/report/' . $report_to_council->id;
 
     like $body, qr#$expected1#, 'non cobrand area report point to fixmystreet.com';
@@ -460,7 +460,7 @@ my $local_alert = FixMyStreet::App->model('DB::Alert')->find_or_create(
         parameter2 => 52.727588,
         alert_type => 'local_problems',
         whensubscribed => $dt->ymd . ' ' . $dt->hms,
-        cobrand     => 'lichfielddc',
+        cobrand     => 'hart',
         confirmed => 1,
     }
 );
@@ -480,7 +480,7 @@ subtest "check local alerts from cobrand send main site url for alerts for diffe
     my $body = $email->body;
 
     my $expected1 = mySociety::Config::get('BASE_URL') . '/report/' . $report_to_county_council->id;
-    my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker('lichfielddc')->new();
+    my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker('hart')->new();
     my $expected2 = $cobrand->base_url . '/report/' . $report_to_council->id;
 
     like $body, qr#$expected1#, 'non cobrand area report point to fixmystreet.com';
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index f15d56bfe..96c2771da 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -381,8 +381,8 @@ for my $body (
     { id => 2651, name => 'City of Edinburgh Council' },
     { id => 2226, name => 'Gloucestershire County Council' },
     { id => 2326, name => 'Cheltenham Borough Council' },
-    { id => 2434, name => 'Lichfield District Council' },
-    { id => 2240, name => 'Staffordshire County Council' },
+    { id => 2333, name => 'Hart Council' },
+    { id => 2227, name => 'Hampshire County Council' },
     { id => 14279, name => 'Ballymoney Borough Council' },
     { id => 2636, name => 'Isle of Wight Council' },
     { id => 2649, name => 'Fife Council' },
@@ -405,11 +405,11 @@ for my $contact ( {
     category => 'potholes',
     email => '2326@example.org',
 }, {
-    body_id => 2434, # Lichfield
+    body_id => 2333, # Hart
     category => 'potholes',
     email => 'trees@example.com',
 }, {
-    body_id => 2240, # Staffordshire
+    body_id => 2227, # Hampshire
     category => 'potholes',
     email => 'highways@example.com',
 }, {
@@ -472,20 +472,20 @@ foreach my $test ( {
         desc          => 'email to two tier council that only shows district, district',
         unset_whendef => 1,
         email_count   => 1,
-        to            => qr'Lichfield District Council',
-        dear          => qr'Dear Lichfield District Council,',
-        body          => '2434',
-        cobrand       => 'lichfielddc',
-        url           => 'lichfielddc.',
+        to            => qr'Hart Council',
+        dear          => qr'Dear Hart Council,',
+        body          => '2333',
+        cobrand       => 'hart',
+        url           => 'hart.',
     }, {
         %common,
         desc          => 'email to two tier council that only shows district, county',
         unset_whendef => 1,
         email_count   => 1,
-        to            => qr'Staffordshire County Council" <highways@example',
-        dear          => qr'Dear Staffordshire County Council,',
-        body          => '2240',
-        cobrand       => 'lichfielddc',
+        to            => qr'Hampshire County Council" <highways@example',
+        dear          => qr'Dear Hampshire County Council,',
+        body          => '2227',
+        cobrand       => 'hart',
         url           => 'www.',
     }, {
         %common,
@@ -520,8 +520,8 @@ foreach my $test ( {
             BASE_URL => 'http://www.fixmystreet.com',
             MAPIT_URL => 'http://mapit.mysociety.org/',
         };
-        if ( $test->{cobrand} && $test->{cobrand} =~ /lichfielddc/ ) {
-            $override->{ALLOWED_COBRANDS} = [ 'lichfielddc' ];
+        if ( $test->{cobrand} && $test->{cobrand} =~ /hart/ ) {
+            $override->{ALLOWED_COBRANDS} = [ 'hart' ];
         }
 
         $mech->clear_emails_ok;