Fix tests with new ALLOWED_COBRANDS structure, fix admin test to skip Barnet tests if not present.

1 files changed, 2 insertions, 2 deletions

diff --git a/t/app/controller/reports.t b/t/app/controller/reports.t
index 58803d778..801dbeddb 100644
--- a/t/app/controller/reports.t
+++ b/t/app/controller/reports.t
@@ -17,14 +17,14 @@ $mech->follow_link_ok( { text_regex => qr/Birmingham/ } );
 
 SKIP: {
     skip( "Need 'emptyhomes' in ALLOWED_COBRANDS config", 8 )
-      unless FixMyStreet::App->config->{ALLOWED_COBRANDS} =~ m{emptyhomes};
+        unless FixMyStreet::Cobrand->exists('emptyhomes');
     ok $mech->host("reportemptyhomes.com"), 'change host to reportemptyhomes';
     $mech->get_ok('/reports');
     # EHA lacks one column the others have
     $mech->content_lacks('state unknown');
 
     skip( "Need 'fiksgatami' in ALLOWED_COBRANDS config", 8 )
-      unless FixMyStreet::App->config->{ALLOWED_COBRANDS} =~ m{fiksgatami};
+        unless FixMyStreet::Cobrand->exists('fiksgatami');
     mySociety::MaPit::configure('http://mapit.nuug.no/');
     ok $mech->host("fiksgatami.no"), 'change host to fiksgatami';
     $mech->get_ok('/reports');