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

Conflicts:
	web/css/core.css
	web/js/fixmystreet.js

1 files changed, 40 insertions, 0 deletions

diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t
index be3b74cf5..beeb6c9c1 100644
--- a/t/app/controller/admin.t
+++ b/t/app/controller/admin.t
@@ -997,6 +997,12 @@ subtest 'report search' => sub {
 
     $mech->get_ok('/admin/search_reports?search=' . $report->user->email);
     $mech->content_like( qr{<tr [^>]*hidden[^>]*> \s* <td> \s* $r_id \s* </td>}xs );
+
+    $report->state('fixed - user');
+    $report->update;
+
+    $mech->get_ok('/admin/search_reports?search=' . $report->user->email);
+    $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id/">$r_id</a>} );
 };
 
 subtest 'search abuse' => sub {
@@ -1047,6 +1053,9 @@ $log_entries = FixMyStreet::App->model('DB::AdminLog')->search(
 
 is $log_entries->count, 0, 'no admin log entries';
 
+$user->flagged( 0 );
+$user->update;
+
 for my $test (
     {
         desc => 'edit user name',
@@ -1054,6 +1063,7 @@ for my $test (
             name => 'Test User',
             email => 'test@example.com',
             council => 2509,
+            flagged => undef,
         },
         changes => {
             name => 'Changed User',
@@ -1067,6 +1077,7 @@ for my $test (
             name => 'Changed User',
             email => 'test@example.com',
             council => 2509,
+            flagged => undef,
         },
         changes => {
             email => 'changed@example.com',
@@ -1080,6 +1091,7 @@ for my $test (
             name => 'Changed User',
             email => 'changed@example.com',
             council => 2509,
+            flagged => undef,
         },
         changes => {
             council => 2607,
@@ -1087,6 +1099,34 @@ for my $test (
         log_count => 3,
         log_entries => [qw/edit edit edit/],
     },
+    {
+        desc => 'edit user flagged',
+        fields => {
+            name => 'Changed User',
+            email => 'changed@example.com',
+            council => 2607,
+            flagged => undef,
+        },
+        changes => {
+            flagged => 'on',
+        },
+        log_count => 4,
+        log_entries => [qw/edit edit edit edit/],
+    },
+    {
+        desc => 'edit user remove flagged',
+        fields => {
+            name => 'Changed User',
+            email => 'changed@example.com',
+            council => 2607,
+            flagged => 'on',
+        },
+        changes => {
+            flagged => undef,
+        },
+        log_count => 4,
+        log_entries => [qw/edit edit edit edit/],
+    },
 ) {
     subtest $test->{desc} => sub {
         $mech->get_ok( '/admin/user_edit/' . $user->id );