add flagged checkbox for report editing

1 files changed, 45 insertions, 14 deletions

diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t
index 2740a1dbb..0c9f03fa6 100644
--- a/t/app/controller/admin.t
+++ b/t/app/controller/admin.t
@@ -233,6 +233,7 @@ foreach my $test (
             name   => 'Test User',
             email  => $user->email,
             anonymous => 0,
+            flagged => undef,
         },
         changes => {
             title => 'Edited Report',
@@ -250,6 +251,7 @@ foreach my $test (
             name   => 'Test User',
             email  => $user->email,
             anonymous => 0,
+            flagged => undef,
         },
         changes => {
             detail => 'Edited Detail',
@@ -267,6 +269,7 @@ foreach my $test (
             name   => 'Test User',
             email  => $user->email,
             anonymous => 0,
+            flagged => undef,
         },
         changes => {
             name => 'Edited User',
@@ -277,7 +280,7 @@ foreach my $test (
         user => $user,
     },
     {
-        description => 'edit report user email',
+        description => 'edit report set flagged true',
         fields => {
             title  => 'Edited Report',
             detail => 'Edited Detail',
@@ -285,13 +288,33 @@ foreach my $test (
             name   => 'Edited User',
             email  => $user->email,
             anonymous => 0,
+            flagged => undef,
         },
         changes => {
-            email => $user2->email,
+            flagged => 'on',
         },
         log_count => 4,
         log_entries => [ qw/edit edit edit edit/ ],
         resend => 0,
+        user => $user,
+    },
+    {
+        description => 'edit report user email',
+        fields => {
+            title  => 'Edited Report',
+            detail => 'Edited Detail',
+            state  => 'confirmed',
+            name   => 'Edited User',
+            email  => $user->email,
+            anonymous => 0,
+            flagged => 'on',
+        },
+        changes => {
+            email => $user2->email,
+        },
+        log_count => 5,
+        log_entries => [ qw/edit edit edit edit edit/ ],
+        resend => 0,
         user => $user2,
     },
     {
@@ -303,12 +326,13 @@ foreach my $test (
             name   => 'Edited User',
             email  => $user2->email,
             anonymous => 0,
+            flagged => 'on',
         },
         changes => {
             state => 'unconfirmed'
         },
-        log_count => 5,
-        log_entries => [ qw/state_change edit edit edit edit/ ],
+        log_count => 6,
+        log_entries => [ qw/state_change edit edit edit edit edit/ ],
         resend => 0,
     },
     {
@@ -320,12 +344,13 @@ foreach my $test (
             name   => 'Edited User',
             email  => $user2->email,
             anonymous => 0,
+            flagged => 'on',
         },
         changes => {
             state => 'confirmed'
         },
-        log_count => 6,
-        log_entries => [ qw/state_change state_change edit edit edit edit/ ],
+        log_count => 7,
+        log_entries => [ qw/state_change state_change edit edit edit edit edit/ ],
         resend => 0,
     },
     {
@@ -337,12 +362,13 @@ foreach my $test (
             name   => 'Edited User',
             email  => $user2->email,
             anonymous => 0,
+            flagged => 'on',
         },
         changes => {
             state => 'fixed'
         },
-        log_count => 7,
-        log_entries => [ qw/state_change state_change state_change edit edit edit edit/ ],
+        log_count => 8,
+        log_entries => [ qw/state_change state_change state_change edit edit edit edit edit/ ],
         resend => 0,
     },
     {
@@ -354,12 +380,13 @@ foreach my $test (
             name   => 'Edited User',
             email  => $user2->email,
             anonymous => 0,
+            flagged => 'on',
         },
         changes => {
             state => 'hidden'
         },
-        log_count => 8,
-        log_entries => [ qw/state_change state_change state_change state_change edit edit edit edit/ ],
+        log_count => 9,
+        log_entries => [ qw/state_change state_change state_change state_change edit edit edit edit edit/ ],
         resend => 0,
     },
     {
@@ -371,13 +398,14 @@ foreach my $test (
             name   => 'Edited User',
             email  => $user2->email,
             anonymous => 0,
+            flagged => 'on',
         },
         changes => {
             state => 'confirmed',
             anonymous => 1,
         },
-        log_count => 10,
-        log_entries => [ qw/edit state_change state_change state_change state_change state_change edit edit edit edit/ ],
+        log_count => 11,
+        log_entries => [ qw/edit state_change state_change state_change state_change state_change edit edit edit edit edit/ ],
         resend => 0,
     },
     {
@@ -389,11 +417,12 @@ foreach my $test (
             name   => 'Edited User',
             email  => $user2->email,
             anonymous => 1,
+            flagged => 'on',
         },
         changes => {
         },
-        log_count => 11,
-        log_entries => [ qw/resend edit state_change state_change state_change state_change state_change edit edit edit edit/ ],
+        log_count => 12,
+        log_entries => [ qw/resend edit state_change state_change state_change state_change state_change edit edit edit edit edit/ ],
         resend => 1,
     },
 ) {
@@ -426,6 +455,7 @@ foreach my $test (
             $mech->content_lacks( 'type="submit" name="resend"', 'no resend button' );
         }
 
+        $test->{changes}->{flagged} = 1 if $test->{changes}->{flagged};
         is $report->$_, $test->{changes}->{$_}, "$_ updated" for grep { $_ ne 'email' } keys %{ $test->{changes} };
 
         if ( $test->{user} ) {
@@ -449,6 +479,7 @@ subtest 'change email to new user' => sub {
         name   => $report->name,
         email  => $report->user->email,
         anonymous => 1,
+        flagged => 'on',
     };
 
     is_deeply( $mech->visible_form_values(), $fields, 'initial form values' );