Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into open311-consumer

Conflicts:
	t/app/model/problem.t
	templates/web/default/report/new/fill_in_details.html
	web/css/core.css

1 files changed, 108 insertions, 0 deletions

diff --git a/t/map/tilma/original.t b/t/map/tilma/original.t
new file mode 100644
index 000000000..3add7719e
--- /dev/null
+++ b/t/map/tilma/original.t
@@ -0,0 +1,108 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use Test::More;
+use FixMyStreet::App;
+use FixMyStreet::Map;
+use FixMyStreet::TestMech;
+use DateTime;
+use mySociety::Locale;
+
+my $mech = FixMyStreet::TestMech->new;
+
+mySociety::Locale::gettext_domain('FixMyStreet');
+
+FixMyStreet::Map::set_map_class();
+my $r = Catalyst::Request->new( { base => URI->new('/'), uri => URI->new('http://fixmystreet.com/test'), parameters => { bbox => '-7.6,49.7,-7.5,49.8' } } );
+
+my $c = FixMyStreet::App->new( {
+    request => $r,
+});
+
+$mech->delete_user('test@example.com');
+my $user =
+  FixMyStreet::App->model('DB::User')
+  ->find_or_create( { email => 'test@example.com', name => 'Test User' } );
+ok $user, "created test user";
+
+my $dt = DateTime->now();
+
+
+my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
+    {
+        postcode           => 'SW1A 1AA',
+        council            => '2504',
+        areas              => ',105255,11806,11828,2247,2504,',
+        category           => 'Other',
+        title              => 'Test 2',
+        detail             => 'Test 2 Detail',
+        used_map           => 't',
+        name               => 'Test User',
+        anonymous          => 'f',
+        state              => 'fixed',
+        confirmed          => $dt->ymd . ' ' . $dt->hms,
+        lang               => 'en-gb',
+        service            => '',
+        cobrand            => 'default',
+        cobrand_data       => '',
+        send_questionnaire => 't',
+        latitude           => '49.7668057243776',
+        longitude          => '-7.55715980363992',
+        user_id            => $user->id,
+    }
+);
+
+for my $test ( 
+    {
+        state => 'fixed', 
+        colour => 'green',
+    },
+    {
+        state => 'fixed - user', 
+        colour => 'green',
+    },
+    {
+        state => 'fixed - council', 
+        colour => 'green',
+    },
+    {
+        state => 'confirmed', 
+        colour => 'red',
+    },
+    {
+        state => 'investigating', 
+        colour => 'red',
+    },
+    {
+        state => 'planned', 
+        colour => 'red',
+    },
+    {
+        state => 'in progress', 
+        colour => 'red',
+    },
+) {
+    subtest "pin colour for state $test->{state}" => sub {
+        $report->state($test->{state});
+        $report->update;
+
+        my ( $pins, $around_map_list, $nearby, $dist ) =
+            FixMyStreet::Map::map_pins( $c, 0, 0, 0, 0 );
+
+        ok $pins;
+        ok $around_map_list;
+        ok $nearby;
+        ok $dist;
+
+        my $id = $report->id;
+        my $colour = $test->{colour};
+
+        is $pins->[0][2], $colour, 'pin colour';
+    };
+}
+
+$mech->delete_user( $user );
+
+
+done_testing();