From ae6884202a7bcb94f8347752031613ef0e712c31 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Tue, 25 Apr 2017 23:33:35 +0100 Subject: [PATCH] Fixed issue with postcode validator --- lib/Pear/LocalLoop/Plugin/Validators.pm | 2 +- t/plugins/validators.t | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/Pear/LocalLoop/Plugin/Validators.pm b/lib/Pear/LocalLoop/Plugin/Validators.pm index eb2ebbb..199d878 100644 --- a/lib/Pear/LocalLoop/Plugin/Validators.pm +++ b/lib/Pear/LocalLoop/Plugin/Validators.pm @@ -32,7 +32,7 @@ sub register { try { $postcode = Geo::UK::Postcode->new( $value ); }; - return defined $postcode && $postcode->valid ? undef : 1; + return defined( $postcode ) && ( $postcode->valid ) && ! ( $postcode->partial ) ? undef : 1; }); diff --git a/t/plugins/validators.t b/t/plugins/validators.t index 60027b3..81c2f02 100644 --- a/t/plugins/validators.t +++ b/t/plugins/validators.t @@ -15,6 +15,7 @@ my $invalid_email = 'test.example.com'; my $valid_postcode = 'WC1H 9EB'; my $invalid_postcode = 'AB1 2CD'; my $not_a_postcode = 'a'; +my $not_a_whole_postcode = 'LA1'; $validation->input({ valid_email => $valid_email, @@ -22,6 +23,7 @@ $validation->input({ valid_postcode => $valid_postcode, invalid_postcode => $invalid_postcode, not_a_postcode => $not_a_postcode, + not_a_whole_postcode => $not_a_whole_postcode, }); $validation->required('valid_email')->email; @@ -29,8 +31,9 @@ $validation->required('invalid_email')->email; $validation->required('valid_postcode')->postcode; $validation->required('invalid_postcode')->postcode; $validation->required('not_a_postcode')->postcode; +$validation->required('not_a_whole_postcode')->postcode; ok $validation->has_error, 'Have Errors'; -is_deeply $validation->failed, [ qw/ invalid_email invalid_postcode not_a_postcode / ], 'Correct Errors'; +is_deeply $validation->failed, [ qw/ invalid_email invalid_postcode not_a_postcode not_a_whole_postcode / ], 'Correct Errors'; done_testing;