2 files changed, 104 insertions, 0 deletions

diff --git a/t/app/model/extra.t b/t/app/model/extra.t
index 17f34c6c1..a5e3e3574 100644
--- a/t/app/model/extra.t
+++ b/t/app/model/extra.t
@@ -98,4 +98,46 @@ subtest 'Default hash layout' => sub {
     };
 };
 
+subtest 'Get named field values' => sub {
+    my $user = $db->resultset('User')->create({
+        email => 'test-moderation@example.com',
+        name => 'Test User'
+    });
+    my $report = $db->resultset('Problem')->create(
+    {
+        postcode           => 'BR1 3SB',
+        bodies_str         => "",
+        areas              => "",
+        category           => 'Other',
+        title              => 'Good bad good',
+        detail             => 'Good bad bad bad good bad',
+        used_map           => 't',
+        name               => 'Test User 2',
+        anonymous          => 'f',
+        state              => 'confirmed',
+        lang               => 'en-gb',
+        service            => '',
+        cobrand            => 'default',
+        latitude           => '51.4129',
+        longitude          => '0.007831',
+        user_id            => $user->id,
+    });
+
+    $report->push_extra_fields(
+        {
+            name => "field1",
+            description => "This is a test field",
+            value => "value 1",
+        },
+        {
+            name => "field 2",
+            description => "Another test",
+            value => "this is a test value",
+        }
+    );
+
+    is $report->get_extra_field_value("field1"), "value 1", "field1 has correct value";
+    is $report->get_extra_field_value("field 2"), "this is a test value", "field 2 has correct value";
+};
+
 done_testing();
diff --git a/t/app/model/state.t b/t/app/model/state.t
new file mode 100644
index 000000000..1653e36e2
--- /dev/null
+++ b/t/app/model/state.t
@@ -0,0 +1,62 @@
+use FixMyStreet::Test;
+use Test::More;
+
+my $rs = FixMyStreet::DB->resultset('State');
+my $trans_rs = FixMyStreet::DB->resultset('Translation');
+
+for (
+    { label => 'in progress', lang => 'de' },
+    { label => 'investigating', lang => 'fr' },
+    { label => 'duplicate', lang => 'de' },
+) {
+    my $lang = $_->{lang};
+    my $obj = $rs->find({ label => $_->{label} });
+    $trans_rs->create({ tbl => 'state', col => 'name', object_id => $obj->id,
+        lang => $lang, msgstr => "$lang $_->{label}" });
+}
+
+my $states = $rs->states;
+my %states = map { $_->label => $_ } @$states;
+
+subtest 'Open/closed database data is as expected' => sub {
+    my $open = $rs->open;
+    is @$open, 5;
+    my $closed = $rs->closed;
+    is @$closed, 5;
+};
+
+is $rs->display('investigating'), 'Investigating';
+is $rs->display('bad'), 'bad';
+is $rs->display('confirmed'), 'Open';
+is $rs->display('closed'), 'Closed';
+is $rs->display('fixed - council'), 'Fixed - Council';
+is $rs->display('fixed - user'), 'Fixed - User';
+is $rs->display('fixed'), 'Fixed';
+
+subtest 'default name is untranslated' => sub {
+    is $states{'in progress'}->name, 'In progress';
+    is $states{'in progress'}->msgstr, 'In progress';
+    is $states{'action scheduled'}->name, 'Action scheduled';
+    is $states{'action scheduled'}->msgstr, 'Action scheduled';
+};
+
+subtest 'msgstr gets translated if available when the language changes' => sub {
+    FixMyStreet::DB->schema->lang('de');
+    is $states{'in progress'}->name, 'In progress';
+    is $states{'in progress'}->msgstr, 'de in progress';
+    is $states{'investigating'}->name, 'Investigating';
+    is $states{'investigating'}->msgstr, 'Investigating';
+    is $states{'unable to fix'}->name, 'No further action';
+    is $states{'unable to fix'}->msgstr, 'No further action';
+};
+
+$rs->clear;
+
+is_deeply [ sort FixMyStreet::DB::Result::Problem->open_states ],
+    ['action scheduled', 'confirmed', 'in progress', 'investigating', 'planned'], 'open states okay';
+is_deeply [ sort FixMyStreet::DB::Result::Problem->closed_states ],
+    ['closed', 'duplicate', 'internal referral', 'not responsible', 'unable to fix'], 'closed states okay';
+is_deeply [ sort FixMyStreet::DB::Result::Problem->fixed_states ],
+    ['fixed', 'fixed - council', 'fixed - user'], 'fixed states okay';
+
+done_testing();