aboutsummaryrefslogtreecommitdiffstats
path: root/t
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2019-03-05 16:41:25 +0000
committerMatthew Somerville <matthew-github@dracos.co.uk>2019-03-06 13:46:51 +0000
commit5d152fc54f84de764336c420d58a5d08db7a42fa (patch)
treee490bb33db57039f1df79f4e1fcb6836f72b7595 /t
parent1e67b3fea57ee8560d0741c96bc5702c90980dad (diff)
Make sure raw RABX column is utf8-encoded.
Without doing this, a call to e.g. $contact->set_extra_fields(@meta) in PopulateServiceList.pm, with an unchanged meta that contains some Unicode values, can write to the database (and cause an unneeded row in the history table), because the column from the database is UTF-8 decoded, whilst the new text is UTF-8 encoded. It looks like an attempt was made in filter_from_storage to fix this issue, but the column comparison for marking a column as dirty takes place without this being called.
Diffstat (limited to 't')
-rw-r--r--t/open311/populate-service-list.t52
1 files changed, 52 insertions, 0 deletions
diff --git a/t/open311/populate-service-list.t b/t/open311/populate-service-list.t
index 9747dfd2f..4d70dfebc 100644
--- a/t/open311/populate-service-list.t
+++ b/t/open311/populate-service-list.t
@@ -19,6 +19,7 @@ package main;
use FixMyStreet::Test;
use FixMyStreet::DB;
+use utf8;
use_ok( 'Open311::PopulateServiceList' );
use_ok( 'Open311' );
@@ -297,6 +298,47 @@ for my $test (
',
},
{
+ desc => 'check meta data unchanging',
+ has_meta => 1,
+ has_no_history => 1,
+ orig_meta => [ {
+ variable => 'true',
+ code => 'type',
+ datatype => 'string',
+ required => 'true',
+ datatype_description => 'Colour of bin',
+ order => 1,
+ description => 'Cólour of bin'
+
+ } ],
+ end_meta => [ {
+ variable => 'true',
+ code => 'type',
+ datatype => 'string',
+ required => 'true',
+ datatype_description => 'Colour of bin',
+ order => 1,
+ description => 'Cólour of bin'
+
+ } ],
+ meta_xml => '<?xml version="1.0" encoding="utf-8"?>
+ <service_definition>
+ <service_code>100</service_code>
+ <attributes>
+ <attribute>
+ <variable>true</variable>
+ <code>type</code>
+ <datatype>string</datatype>
+ <required>true</required>
+ <datatype_description>Colour of bin</datatype_description>
+ <order>1</order>
+ <description>Cólour of bin</description>
+ </attribute>
+ </attributes>
+ </service_definition>
+ ',
+ },
+ {
desc => 'check meta data removed',
has_meta => 0,
end_meta => [],
@@ -389,11 +431,21 @@ for my $test (
$processor->_current_open311( $o );
$processor->_current_body( $body );
+ my $count = FixMyStreet::DB->resultset('ContactsHistory')->search({
+ contact_id => $contact->id,
+ })->count;
+
$processor->process_services( $service_list );
$contact->discard_changes;
is_deeply $contact->get_extra_fields, $test->{end_meta}, 'meta data saved';
+
+ if ($test->{has_no_history}) {
+ is +FixMyStreet::DB->resultset('ContactsHistory')->search({
+ contact_id => $contact->id,
+ })->count, $count, 'No new history';
+ }
};
}