Merge branch 'issues/forcouncils/44-two-tier-change-category'

2 files changed, 79 insertions, 11 deletions

diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t
index a0e013459..6086cf3ac 100644
--- a/t/app/controller/admin.t
+++ b/t/app/controller/admin.t
@@ -16,8 +16,12 @@ my $superuser = $mech->create_user_ok('superuser@example.com', name => 'Super Us
 
 my $oxfordshire = $mech->create_body_ok(2237, 'Oxfordshire County Council', id => 2237);
 my $oxfordshirecontact = $mech->create_contact_ok( body_id => $oxfordshire->id, category => 'Potholes', email => 'potholes@example.com' );
+$mech->create_contact_ok( body_id => $oxfordshire->id, category => 'Traffic lights', email => 'lights@example.com' );
 my $oxfordshireuser = $mech->create_user_ok('counciluser@example.com', name => 'Council User', from_body => $oxfordshire);
 
+my $oxford = $mech->create_body_ok(2421, 'Oxford City Council');
+$mech->create_contact_ok( body_id => $oxford->id, category => 'Graffiti', email => 'graffiti@example.net' );
+
 my $bromley = $mech->create_body_ok(2482, 'Bromley Council', id => 2482);
 
 my $user3 = $mech->create_user_ok('test3@example.com', name => 'Test User 2');
@@ -575,6 +579,34 @@ foreach my $test (
     };
 }
 
+FixMyStreet::override_config {
+    MAPIT_URL => 'http://mapit.mysociety.org/',
+    ALLOWED_COBRANDS => 'fixmystreet',
+}, sub {
+
+subtest 'change report category' => sub {
+    my ($ox_report) = $mech->create_problems_for_body(1, $oxfordshire->id, 'Unsure', {
+        category => 'Potholes',
+        areas => ',2237,2421,', # Cached used by categories_for_point...
+        latitude => 51.7549262252,
+        longitude => -1.25617899435,
+        whensent => \'current_timestamp',
+    });
+    $mech->get_ok("/admin/report_edit/" . $ox_report->id);
+
+    $mech->submit_form_ok( { with_fields => { category => 'Traffic lights' } }, 'form_submitted' );
+    $ox_report->discard_changes;
+    is $ox_report->category, 'Traffic lights';
+    isnt $ox_report->whensent, undef;
+
+    $mech->submit_form_ok( { with_fields => { category => 'Graffiti' } }, 'form_submitted' );
+    $ox_report->discard_changes;
+    is $ox_report->category, 'Graffiti';
+    is $ox_report->whensent, undef;
+};
+
+};
+
 subtest 'change email to new user' => sub {
     $log_entries->delete;
     $mech->get_ok("/admin/report_edit/$report_id");
@@ -1512,13 +1544,15 @@ subtest "response priorities can't be viewed across councils" => sub {
     };
 };
 
-
-$mech->delete_user( $user );
-$mech->delete_user( $user2 );
-$mech->delete_user( $user3 );
-$mech->delete_user( $superuser );
-$mech->delete_user( 'test4@example.com' );
-$mech->delete_body( $oxfordshire );
-$mech->delete_body( $bromley );
-
-done_testing();
+END {
+    $mech->delete_user( $user );
+    $mech->delete_user( $user2 );
+    $mech->delete_user( $user3 );
+    $mech->delete_user( $superuser );
+    $mech->delete_user( 'test4@example.com' );
+    $mech->delete_body( $oxfordshire );
+    $mech->delete_body( $oxford );
+    $mech->delete_body( $bromley );
+    $mech->delete_body( $westminster );
+    done_testing();
+}
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index f2047b8e5..efb32d116 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -17,9 +17,15 @@ FixMyStreet::DB->resultset("ContactResponsePriority")->create({
     contact => $contact,
     response_priority => $rp,
 });
+my $wodc = $mech->create_body_ok(2420, 'West Oxfordshire District Council', id => 2420);
+$mech->create_contact_ok( body_id => $wodc->id, category => 'Horses', email => 'horses@example.net' );
+
 
 my ($report) = $mech->create_problems_for_body(1, $oxon->id, 'Test', {
-    category => 'Cows', cobrand => 'fixmystreet', areas => ',2237,' });
+    category => 'Cows', cobrand => 'fixmystreet', areas => ',2237,2420',
+    whensent => \'current_timestamp',
+    latitude => 51.847693, longitude => -1.355908,
+});
 my $report_id = $report->id;
 
 my $user = $mech->log_in_ok('test@example.com');
@@ -127,6 +133,34 @@ FixMyStreet::override_config {
     };
 };
 
+FixMyStreet::override_config {
+    MAPIT_URL => 'http://mapit.mysociety.org/',
+    ALLOWED_COBRANDS => [ 'oxfordshire', 'fixmystreet' ],
+    BASE_URL => 'http://fixmystreet.site',
+}, sub {
+    subtest "test category/body changes" => sub {
+        $mech->host('oxfordshire.fixmystreet.site');
+        $report->update({ state => 'confirmed' });
+        $mech->get_ok("/report/$report_id");
+        # Then change the category to the other council in this location,
+        # which should cause it to be resent. We clear the host because
+        # otherwise testing stays on host() above.
+        $mech->clear_host;
+        $mech->submit_form(button => 'save', with_fields => { category => 'Horses' });
+
+        $report->discard_changes;
+        is $report->category, "Horses", "Report in correct category";
+        is $report->whensent, undef, "Report marked as unsent";
+        is $report->bodies_str, $wodc->id, "Reported to WODC";
+
+        is $mech->uri->path, "/report/$report_id", "redirected to correct page";
+        is $mech->res->code, 200, "got 200 for final destination";
+        is $mech->res->previous->code, 302, "got 302 for redirect";
+        # Extra check given host weirdness
+        is $mech->res->previous->header('Location'), "http://fixmystreet.site/report/$report_id";
+    };
+};
+
 
 END {
     $mech->delete_body($oxon);