From a203eba4e7943e49db081da47b53318836b31c64 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 7 Jun 2024 11:09:12 +0100 Subject: [PATCH] [TfL] Allow through TfL as a name if reporting as staff. --- perllib/FixMyStreet/Cobrand/TfL.pm | 14 ++++++++++++++ t/cobrand/tfl.t | 24 ++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/perllib/FixMyStreet/Cobrand/TfL.pm b/perllib/FixMyStreet/Cobrand/TfL.pm index 9be9906ca42..ba3f5e7e430 100644 --- a/perllib/FixMyStreet/Cobrand/TfL.pm +++ b/perllib/FixMyStreet/Cobrand/TfL.pm @@ -444,6 +444,20 @@ sub report_new_munge_before_insert { $report->set_extra_fields(@$extra); } +=head2 report_validation + +Allow through "TfL" as a name if reporting as staff. + +=cut + +sub report_validation { + my ($self, $report, $errors) = @_; + + if ($errors->{name} && $report->name eq 'TfL' && $report->user->from_body) { + delete $errors->{name}; + } +} + sub report_new_is_on_tlrn { my ( $self ) = @_; diff --git a/t/cobrand/tfl.t b/t/cobrand/tfl.t index e0b8d6fcf1a..e541ef09ac4 100644 --- a/t/cobrand/tfl.t +++ b/t/cobrand/tfl.t @@ -416,6 +416,30 @@ subtest "test report creation anonymously by staff user" => sub { $mech->log_out_ok; }; +subtest "test report creation as body by staff user" => sub { + $mech->log_in_ok( $staffuser->email ); + $mech->get_ok('/around'); + $mech->submit_form_ok( { with_fields => { pc => 'BR1 3UH', } }, "submit location" ); + $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" ); + $mech->submit_form_ok({ with_fields => { + title => 'Test Report 3', + detail => 'Test report details.', + category => 'Bus stops', + } }, "submit report"); + is_deeply $mech->page_errors, [], "check there were no errors"; + + my $report = FixMyStreet::DB->resultset("Problem")->find({ title => 'Test Report 3'}); + ok $report, "Found the report"; + is $report->name, 'TfL'; + is $report->user->email, $staffuser->email; + is $report->anonymous, 0; + is $report->get_extra_metadata('contributed_as'), 'body'; + + $mech->content_contains('Your issue is on its way to Transport for London'); + $mech->content_contains('Your reference for this report is FMS' . $report->id); + $mech->log_out_ok; +}; + FixMyStreet::DB->resultset("Problem")->delete_all; my $tfl_staff = FixMyStreet::DB->resultset("User")->find({ email => 'test@tfl.gov.uk'});