diff options
-rw-r--r-- | perllib/FixMyStreet/Cobrand/BathNES.pm | 2 | ||||
-rw-r--r-- | perllib/FixMyStreet/Cobrand/Borsetshire.pm | 2 | ||||
-rw-r--r-- | perllib/FixMyStreet/Cobrand/Bristol.pm | 2 | ||||
-rw-r--r-- | perllib/FixMyStreet/Cobrand/Bromley.pm | 2 | ||||
-rw-r--r-- | perllib/FixMyStreet/Cobrand/Buckinghamshire.pm | 2 | ||||
-rw-r--r-- | perllib/FixMyStreet/Cobrand/Lincolnshire.pm | 1 | ||||
-rw-r--r-- | perllib/FixMyStreet/Cobrand/Northamptonshire.pm | 2 | ||||
-rw-r--r-- | perllib/FixMyStreet/Cobrand/Oxfordshire.pm | 2 | ||||
-rw-r--r-- | perllib/FixMyStreet/Cobrand/UKCouncils.pm | 5 | ||||
-rw-r--r-- | t/cobrand/features.t | 6 |
10 files changed, 10 insertions, 16 deletions
diff --git a/perllib/FixMyStreet/Cobrand/BathNES.pm b/perllib/FixMyStreet/Cobrand/BathNES.pm index 773edd3c3..e26e846c3 100644 --- a/perllib/FixMyStreet/Cobrand/BathNES.pm +++ b/perllib/FixMyStreet/Cobrand/BathNES.pm @@ -22,8 +22,6 @@ sub contact_email { return join( '@', 'councilconnect_rejections', 'bathnes.gov.uk' ); } -sub suggest_duplicates { 1 } - sub admin_user_domain { 'bathnes.gov.uk' } sub base_url { diff --git a/perllib/FixMyStreet/Cobrand/Borsetshire.pm b/perllib/FixMyStreet/Cobrand/Borsetshire.pm index e721bee0f..44a4a9162 100644 --- a/perllib/FixMyStreet/Cobrand/Borsetshire.pm +++ b/perllib/FixMyStreet/Cobrand/Borsetshire.pm @@ -33,6 +33,4 @@ sub bypass_password_checks { 1 } sub enable_category_groups { 1 } -sub suggest_duplicates { 1 } - 1; diff --git a/perllib/FixMyStreet/Cobrand/Bristol.pm b/perllib/FixMyStreet/Cobrand/Bristol.pm index e03584889..fa2d3fabb 100644 --- a/perllib/FixMyStreet/Cobrand/Bristol.pm +++ b/perllib/FixMyStreet/Cobrand/Bristol.pm @@ -9,8 +9,6 @@ sub council_area { return 'Bristol'; } sub council_name { return 'Bristol County Council'; } sub council_url { return 'bristol'; } -sub suggest_duplicates { 1 } - sub base_url { my $self = shift; return $self->next::method() if FixMyStreet->config('STAGING_SITE'); diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm index c25dc3bf6..986836b2f 100644 --- a/perllib/FixMyStreet/Cobrand/Bromley.pm +++ b/perllib/FixMyStreet/Cobrand/Bromley.pm @@ -14,8 +14,6 @@ sub council_area { return 'Bromley'; } sub council_name { return 'Bromley Council'; } sub council_url { return 'bromley'; } -sub suggest_duplicates { 1 } - sub report_validation { my ($self, $report, $errors) = @_; diff --git a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm index 0ba216e7b..f2467d248 100644 --- a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm +++ b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm @@ -12,8 +12,6 @@ sub council_area { return 'Buckinghamshire'; } sub council_name { return 'Buckinghamshire County Council'; } sub council_url { return 'buckinghamshire'; } -sub suggest_duplicates { 1 } - sub example_places { return ( 'HP19 7QF', "Walton Road" ); } diff --git a/perllib/FixMyStreet/Cobrand/Lincolnshire.pm b/perllib/FixMyStreet/Cobrand/Lincolnshire.pm index ca177ba7c..8d8ba3268 100644 --- a/perllib/FixMyStreet/Cobrand/Lincolnshire.pm +++ b/perllib/FixMyStreet/Cobrand/Lincolnshire.pm @@ -19,7 +19,6 @@ sub council_url { return 'lincolnshire'; } sub is_two_tier { 1 } sub enable_category_groups { 1 } -sub suggest_duplicates { 1 } sub send_questionnaires { 0 } sub report_sent_confirmation_email { 'external_id' } diff --git a/perllib/FixMyStreet/Cobrand/Northamptonshire.pm b/perllib/FixMyStreet/Cobrand/Northamptonshire.pm index 861938384..683dc059c 100644 --- a/perllib/FixMyStreet/Cobrand/Northamptonshire.pm +++ b/perllib/FixMyStreet/Cobrand/Northamptonshire.pm @@ -12,8 +12,6 @@ sub council_area { 'Northamptonshire' } sub council_name { 'Northamptonshire County Council' } sub council_url { 'northamptonshire' } -sub suggest_duplicates { 1 } - sub example_places { ( 'NN1 1NS', "Bridge Street" ) } sub enter_postcode_text { 'Enter a Northamptonshire postcode, street name and area, or check an existing report number' } diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm index 00556a556..845536bb1 100644 --- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm +++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm @@ -10,8 +10,6 @@ sub council_name { return 'Oxfordshire County Council'; } sub council_url { return 'oxfordshire'; } sub is_two_tier { return 1; } -sub suggest_duplicates { 1 } - sub report_validation { my ($self, $report, $errors) = @_; diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm index 1beafef73..0926dec4a 100644 --- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm +++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm @@ -15,6 +15,11 @@ sub is_council { 1; } +sub suggest_duplicates { + my $self = shift; + return $self->feature('suggest_duplicates'); +} + sub path_to_web_templates { my $self = shift; return [ diff --git a/t/cobrand/features.t b/t/cobrand/features.t index 4b9190d55..45ea6336d 100644 --- a/t/cobrand/features.t +++ b/t/cobrand/features.t @@ -2,15 +2,19 @@ use FixMyStreet::Test; use FixMyStreet::Cobrand; FixMyStreet::override_config { + ALLOWED_COBRANDS => ['bromley'], COBRAND_FEATURES => { foo => { tester => 1 }, - bar => { default => 1 } + bar => { default => 1 }, + suggest_duplicates => { bromley => 1 }, } }, sub { my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker('default')->new; + my $bromley = FixMyStreet::Cobrand->get_class_for_moniker('bromley')->new; is $cobrand->feature('foo'), undef; is $cobrand->feature('bar'), 1; + is $bromley->suggest_duplicates, 1; }; done_testing(); |