Merge tag 'v2.0.1' into fiksgatami-dev-v2

5 files changed, 105 insertions, 27 deletions

diff --git a/t/app/controller/auth.t b/t/app/controller/auth.t
index 251aa2977..22ade6f4b 100644
--- a/t/app/controller/auth.t
+++ b/t/app/controller/auth.t
@@ -2,6 +2,7 @@ use strict;
 use warnings;
 
 use Test::More;
+use Test::MockModule;
 
 use FixMyStreet::TestMech;
 my $mech = FixMyStreet::TestMech->new;
@@ -33,6 +34,13 @@ for my $test (
   )
 {
     my ( $email, $error_message ) = @$test;
+
+    my $resolver = Test::MockModule->new('Net::DNS::Resolver');
+    $resolver->mock('send', sub {
+        my ($self, $domain, $type) = @_;
+        return Net::DNS::Packet->new;
+    });
+
     pass "--- testing bad email '$email' gives error '$error_message'";
     $mech->get_ok('/auth');
     is_deeply $mech->page_errors, [], 'no errors initially';
diff --git a/t/app/controller/report_display.t b/t/app/controller/report_display.t
index fb532ddc4..fad8b2bbb 100644
--- a/t/app/controller/report_display.t
+++ b/t/app/controller/report_display.t
@@ -25,31 +25,16 @@ my $dt = DateTime->new(
     second => 23
 );
 
-my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
-    {
-        postcode           => 'SW1A 1AA',
-        bodies_str         => '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              => 'confirmed',
-        confirmed          => $dt->ymd . ' ' . $dt->hms,
-        lang               => 'en-gb',
-        service            => '',
-        cobrand            => 'default',
-        cobrand_data       => '',
-        send_questionnaire => 't',
-        latitude           => '51.5016605453401',
-        longitude          => '-0.142497580865087',
-        user_id            => $user->id,
-    }
-);
+my $westminster = $mech->create_body_ok(2504, 'Westminster City Council');
+my ($report, $report2) = $mech->create_problems_for_body(2, $westminster->id, "Example", {
+    user => $user,
+    confirmed => $dt->ymd . ' ' . $dt->hms,
+});
+$report->update({
+    title => 'Test 2',
+    detail => 'Test 2 Detail'
+});
 my $report_id = $report->id;
-ok $report, "created test report - $report_id";
 
 subtest "check that no id redirects to homepage" => sub {
     $mech->get_ok('/report');
@@ -125,6 +110,22 @@ subtest "check owner of report can view non public reports" => sub {
     ok $report->update( { non_public => 0 } ), 'make report public';
 };
 
+subtest "duplicate reports are signposted correctly" => sub {
+    $report2->set_extra_metadata(duplicate_of => $report->id);
+    $report2->state('duplicate');
+    $report2->update;
+
+    my $report2_id = $report2->id;
+    ok $mech->get("/report/$report2_id"), "get '/report/$report2_id'";
+    $mech->content_contains('This report is a duplicate');
+    $mech->content_contains($report->title);
+    $mech->log_out_ok;
+
+    $report2->unset_extra_metadata('duplicate_of');
+    $report2->state('confirmed');
+    $report2->update;
+};
+
 subtest "test a good report" => sub {
     $mech->get_ok("/report/$report_id");
     is $mech->uri->path, "/report/$report_id", "at /report/$report_id";
@@ -532,5 +533,6 @@ subtest "Zurich banners are displayed correctly" => sub {
 
 END {
     $mech->delete_user('test@example.com');
+    $mech->delete_body($westminster);
     done_testing();
 }
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index efb32d116..4697cc9d1 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -21,12 +21,14 @@ my $wodc = $mech->create_body_ok(2420, 'West Oxfordshire District Council', id =
 $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', {
+my ($report, $report2) = $mech->create_problems_for_body(2, $oxon->id, 'Test', {
     category => 'Cows', cobrand => 'fixmystreet', areas => ',2237,2420',
     whensent => \'current_timestamp',
     latitude => 51.847693, longitude => -1.355908,
 });
 my $report_id = $report->id;
+my $report2_id = $report2->id;
+
 
 my $user = $mech->log_in_ok('test@example.com');
 $user->update( { from_body => $oxon } );
@@ -93,6 +95,59 @@ FixMyStreet::override_config {
         $mech->content_lacks('Invalid location');
     };
 
+    subtest "test duplicate reports are shown" => sub {
+        my $old_state = $report->state;
+        $report->set_extra_metadata('duplicate_of' => $report2->id);
+        $report->state('duplicate');
+        $report->update;
+
+        $mech->get_ok("/report/$report_id");
+        $mech->content_contains($report2->title);
+
+        $mech->get_ok("/report/$report2_id");
+        $mech->content_contains($report->title);
+
+        $report->unset_extra_metadata('duplicate_of');
+        $report->state($old_state);
+        $report->update;
+    };
+
+    subtest "marking a report as a duplicate with update correctly sets update status" => sub {
+        my $old_state = $report->state;
+        $report->comments->delete_all;
+
+        $mech->get_ok("/report/$report_id");
+        $mech->submit_form_ok({ button => 'save', with_fields => { state => 'Duplicate', duplicate_of => $report2->id, public_update => "This is a duplicate.", save_inspected => "1" } });
+        $report->discard_changes;
+
+        is $report->state, 'duplicate', 'report marked as duplicate';
+        is $report->comments->search({ problem_state => 'duplicate' })->count, 1, 'update marking report as duplicate was left';
+
+        $report->update({ state => $old_state });
+    };
+
+    subtest "marking a report as a duplicate doesn't clobber user-provided update" => sub {
+        my $old_state = $report->state;
+        $report->comments->delete_all;
+
+        $mech->get_ok("/report/$report_id");
+        my $update_text = "This text was entered as an update by the user.";
+        $mech->submit_form_ok({ button => 'save', with_fields => {
+            state => 'Duplicate',
+            duplicate_of => $report2->id,
+            public_update => $update_text,
+            save_inspected => "1",
+        }});
+        $report->discard_changes;
+
+        is $report->state, 'duplicate', 'report marked as duplicate';
+        is $report->comments->search({ problem_state => 'duplicate' })->count, 1, 'update marked report as duplicate';
+        $mech->content_contains($update_text);
+        $mech->content_lacks("Thank you for your report. This problem has already been reported.");
+
+        $report->update({ state => $old_state });
+    };
+
     foreach my $test (
         { type => 'report_edit_priority', priority => 1 },
         { type => 'report_edit_category', category => 1 },
@@ -102,8 +157,8 @@ FixMyStreet::override_config {
             $user->user_body_permissions->delete;
             $user->user_body_permissions->create({ body => $oxon, permission_type => $test->{type} });
             $mech->get_ok("/report/$report_id");
-            $mech->contains_or_lacks($test->{priority}, 'Priority');
-            $mech->contains_or_lacks($test->{priority}, 'High');
+            $mech->contains_or_lacks($test->{priority}, 'Priority</label>');
+            $mech->contains_or_lacks($test->{priority}, '>High');
             $mech->contains_or_lacks($test->{category}, 'Category');
             $mech->contains_or_lacks($test->{detailed}, 'Extra details');
             $mech->submit_form_ok({
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index e1cd0da71..5a88097fa 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -685,6 +685,8 @@ for my $test (
         my $meta_state = $test->{meta} || $test->{fields}->{state};
         if ( $test->{reopened} ) {
             like $update_meta->[0], qr/reopened$/, 'update meta says reopened';
+        } elsif ( $test->{state} eq 'duplicate' ) {
+            like $update_meta->[0], qr/closed as $meta_state$/, 'update meta includes state change';
         } else {
             like $update_meta->[0], qr/marked as $meta_state$/, 'update meta includes state change';
         }
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index bd7d0e55c..1130078c0 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -763,6 +763,17 @@ subtest 'check response templates' => sub {
     is $problem->response_templates, 2, 'Global and pothole templates returned';
 };
 
+subtest 'check duplicate reports' => sub {
+    my ($problem1, $problem2) = $mech->create_problems_for_body(2, $body_ids{2651}, 'TITLE');
+    $problem1->set_extra_metadata(duplicate_of => $problem2->id);
+    $problem1->state('duplicate');
+    $problem1->update;
+
+    is $problem1->duplicate_of->title, $problem2->title, 'problem1 returns correct problem from duplicate_of';
+    is scalar @{ $problem2->duplicates }, 1, 'problem2 has correct number of duplicates';
+    is $problem2->duplicates->[0]->title, $problem1->title, 'problem2 includes problem1 in duplicates';
+};
+
 END {
     $problem->comments->delete if $problem;
     $problem->delete if $problem;