Merge tag 'v3.0.1' into fiksgatami-dev

1 files changed, 87 insertions, 1056 deletions

diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index af18c39b9..d2da75f2c 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -1,60 +1,32 @@
+package FixMyStreet::Cobrand::HounslowNoName;
+use base 'FixMyStreet::Cobrand::UK';
+
+sub council_area_id { 2483 };
+
+package main;
+
 use Test::MockModule;
 use FixMyStreet::TestMech;
-use FixMyStreet::App;
-use Web::Scraper;
-use Path::Class;
 
 # disable info logs for this test run
 FixMyStreet::App->log->disable('info');
 END { FixMyStreet::App->log->enable('info'); }
 
 my $mech = FixMyStreet::TestMech->new;
-$mech->get_ok('/report/new');
-
-my $sample_file = file(__FILE__)->parent->file("sample.jpg")->stringify;
-ok -e $sample_file, "sample file $sample_file exists";
-
-subtest "test that bare requests to /report/new get redirected" => sub {
-
-    $mech->get_ok('/report/new');
-    is $mech->uri->path, '/', "went to /";
-    is_deeply { $mech->uri->query_form }, {}, "query empty";
-
-    FixMyStreet::override_config {
-        MAPIT_URL => 'http://mapit.uk/',
-    }, sub {
-        $mech->get_ok('/report/new?pc=SW1A%201AA');
-        is $mech->uri->path, '/around', "went to /around";
-        is_deeply { $mech->uri->query_form }, { pc => 'SW1A 1AA' },
-          "pc correctly transferred";
-
-        $mech->get_ok('/report/new?pc_override=SW1A%201AA&latitude=51&longitude=-2');
-        is $mech->uri->path, '/around', "went to /around";
-        is_deeply { $mech->uri->query_form }, { pc => 'SW1A 1AA' },
-          "pc correctly transferred, lat/lon gone";
-    };
-};
 
 my %body_ids;
-my @bodies;
 for my $body (
     { area_id => 2651, name => 'City of Edinburgh Council' },
     { area_id => 2226, name => 'Gloucestershire County Council' },
     { area_id => 2326, name => 'Cheltenham Borough Council' },
-    { area_id => 2504, name => 'Westminster City Council' },
     { area_id => 2482, name => 'Bromley Council' },
     { area_id => 2227, name => 'Hampshire County Council' },
     { area_id => 2333, name => 'Hart Council' },
     { area_id => 2535, name => 'Sandwell Borough Council' },
     { area_id => 1000, name => 'Highways England' },
-    { area_id => 2217, name => 'Buckinghamshire County Council' },
-    { area_id => 2232, name => 'Lincolnshire County Council' },
-    { area_id => 2237, name => 'Oxfordshire County Council' },
-    { area_id => 2600, name => 'Rutland County Council' },
-    { area_id => 2234, name => 'Northamptonshire County Council' },
+    { area_id => 2483, name => 'Hounslow Borough Council' },
 ) {
     my $body_obj = $mech->create_body_ok($body->{area_id}, $body->{name});
-    push @bodies, $body_obj;
     $body_ids{$body->{area_id}} = $body_obj->id;
 }
 
@@ -74,31 +46,26 @@ my $contact3 = $mech->create_contact_ok(
     category => 'Trees',
     email => 'trees@example.com',
 );
-my $contact4 = $mech->create_contact_ok(
+$mech->create_contact_ok(
     body_id => $body_ids{2482}, # Bromley
     category => 'Trees',
     email => 'trees@example.com',
 );
-my $contact5 = $mech->create_contact_ok(
+$mech->create_contact_ok(
     body_id => $body_ids{2651}, # Edinburgh
     category => 'Trees',
     email => 'trees@example.com',
 );
-my $contact6 = $mech->create_contact_ok(
+$mech->create_contact_ok(
     body_id => $body_ids{2333}, # Hart
     category => 'Trees',
     email => 'trees@example.com',
 );
-my $contact7 = $mech->create_contact_ok(
+$mech->create_contact_ok(
     body_id => $body_ids{2227}, # Hampshire
     category => 'Street  lighting',
     email => 'highways@example.com',
 );
-my $contact8 = $mech->create_contact_ok(
-    body_id => $body_ids{2504},
-    category => 'Street lighting',
-    email => 'highways@example.com'
-);
 my $contact9 = $mech->create_contact_ok(
     body_id => $body_ids{2226}, # Gloucestershire
     category => 'Street lighting',
@@ -109,573 +76,23 @@ my $contact10 = $mech->create_contact_ok(
     category => 'Street lighting',
     email => 'streetlights-2326@example.com',
 );
-my $contact11 = $mech->create_contact_ok(
+$mech->create_contact_ok(
     body_id => $body_ids{1000}, # Highways
     category => 'Pothole',
     email => 'pothole-1000@example.com',
 );
-my $contact12 = $mech->create_contact_ok(
-    body_id => $body_ids{2217}, # Buckinghamshire
-    category => 'Street lighting',
-    email => 'streetlights-2217@example.com',
-);
-my $contact13 = $mech->create_contact_ok(
-    body_id => $body_ids{2232}, # Lincolnshire
+$mech->create_contact_ok(
+    body_id => $body_ids{2483}, # Hounslow
     category => 'Trees',
-    email => 'trees-2232@example.com',
+    email => 'trees-2483@example.com',
 );
-my $contact14 = $mech->create_contact_ok(
-    body_id => $body_ids{2237}, # Oxfordshire
-    category => 'Trees',
-    email => 'trees-2247@example.com',
-);
-my $contact15 = $mech->create_contact_ok(
-    body_id => $body_ids{2600}, # Rutland
-    category => 'Trees',
-    email => 'trees-2600@example.com',
-);
-my $contact16 = $mech->create_contact_ok(
-    body_id => $body_ids{2234}, # Northamptonshire
-    category => 'Trees',
-    email => 'trees-2234@example.com',
+$mech->create_contact_ok(
+    body_id => $body_ids{2483}, # Hounslow
+    category => 'General Enquiry',
+    email => 'general-enquiry-2483@example.com',
+    non_public => 1,
 );
 
-# test that the various bit of form get filled in and errors correctly
-# generated.
-foreach my $test (
-    {
-        msg    => 'all fields empty',
-        pc     => 'OX1 3DH',
-        fields => {
-            title         => '',
-            detail        => '',
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => '',
-            may_show_name => '1',
-            username      => '',
-            phone         => '',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => {},
-        errors  => [
-            'Please enter a subject',
-            'Please enter some details',
-            # No category error, as no categories for Oxon at all, so is skipped
-            'Please enter your email',
-            'Please enter your name',
-        ],
-    },
-    {
-        msg    => 'all fields empty, bad category',
-        pc     => 'GL50 2PR',
-        fields => {
-            title         => '',
-            detail        => '',
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => '',
-            may_show_name => '1',
-            username      => '',
-            phone         => '',
-            category      => 'Something bad',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => {
-            category => '-- Pick a category --',
-        },
-        errors  => [
-            'Please enter a subject',
-            'Please enter some details',
-            'Please choose a category',
-            'Please enter your email',
-            'Please enter your name',
-        ],
-    },
-    {
-        msg    => 'all fields empty except category',
-        pc     => 'SW1A 1AA',
-        fields => {
-            title         => '',
-            detail        => '',
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => '',
-            may_show_name => '1',
-            username      => '',
-            phone         => '',
-            category      => 'Street lighting',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => {},
-        errors  => [
-            'Please enter a subject',
-            'Please enter some details',
-            'Please enter your email',
-            'Please enter your name',
-        ],
-    },
-    {
-        msg    => 'may_show_name is remembered',
-        pc     => 'SW1A 1AA',
-        fields => {
-            title         => '',
-            detail        => '',
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => '',
-            may_show_name => undef,
-            username      => '',
-            phone         => '',
-            category      => 'Street lighting',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => {},
-        errors  => [
-            'Please enter a subject',
-            'Please enter some details',
-            'Please enter your email',
-            'Please enter your name',
-        ],
-    },
-    {
-        msg    => 'may_show_name unchanged if name is present (stays false)',
-        pc     => 'SW1A 1AA',
-        fields => {
-            title         => '',
-            detail        => '',
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => 'Bob Jones',
-            may_show_name => undef,
-            username      => '',
-            phone         => '',
-            category      => 'Street lighting',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => {},
-        errors  => [
-            'Please enter a subject',
-            'Please enter some details',
-            'Please enter your email',
-        ],
-    },
-    {
-        msg    => 'may_show_name unchanged if name is present (stays true)',
-        pc     => 'SW1A 1AA',
-        fields => {
-            title         => '',
-            detail        => '',
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => 'Bob Jones',
-            may_show_name => '1',
-            username      => '',
-            phone         => '',
-            category      => 'Street lighting',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => {},
-        errors  => [
-            'Please enter a subject',
-            'Please enter some details',
-            'Please enter your email',
-        ],
-    },
-    {
-        msg    => 'title and details tidied up',
-        pc     => 'SW1A 1AA',
-        fields => {
-            title         => "DOG SHIT\r\nON WALLS",
-            detail        => "on this portakabin -\r\n\r\nmore of a portaloo HEH!!",
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => 'Bob Jones',
-            may_show_name => '1',
-            username      => '',
-            phone         => '',
-            category      => 'Street lighting',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => {
-            title => 'Dog poo on walls',
-            detail =>
-              "On this [portable cabin] -\n\nMore of a [portable loo] HEH!!",
-        },
-        errors => [ 'Please enter your email', ],
-    },
-    {
-        msg    => 'name too short',
-        pc     => 'SW1A 1AA',
-        fields => {
-            title         => 'Test title',
-            detail        => 'Test detail',
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => 'DUDE',
-            may_show_name => '1',
-            username      => '',
-            phone         => '',
-            category      => 'Street lighting',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => {},
-        errors  => [
-            'Please enter your email',
-'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below',
-        ],
-    },
-    {
-        msg    => 'name is anonymous',
-        pc     => 'SW1A 1AA',
-        fields => {
-            title         => 'Test title',
-            detail        => 'Test detail',
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => 'anonymous',
-            may_show_name => '1',
-            username      => '',
-            phone         => '',
-            category      => 'Street lighting',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => {},
-        errors  => [
-            'Please enter your email',
-'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below',
-        ],
-    },
-    {
-        msg    => 'email invalid',
-        pc     => 'SW1A 1AA',
-        fields => {
-            title         => 'Test title',
-            detail        => 'Test detail',
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => 'Joe Smith',
-            may_show_name => '1',
-            username      => 'not an email',
-            phone         => '',
-            category      => 'Street lighting',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => { username => 'notanemail' },
-        errors  => [ 'Please enter a valid email', ],
-    },
-    {
-        msg    => 'cleanup title and detail',
-        pc     => 'SW1A 1AA',
-        fields => {
-            title         => "   Test   title   ",
-            detail        => "   first line   \n\n second\nline\n\n   ",
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => '',
-            may_show_name => '1',
-            username      => '',
-            phone         => '',
-            category      => 'Street lighting',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => {
-            title  => 'Test title',
-            detail => "First line\n\nSecond line",
-        },
-        errors => [
-            'Please enter your email',
-            'Please enter your name',
-        ],
-    },
-    {
-        msg    => 'clean up name and email',
-        pc     => 'SW1A 1AA',
-        fields => {
-            title         => '',
-            detail        => '',
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => '  Bob    Jones   ',
-            may_show_name => '1',
-            username      => '   BOB @ExAmplE.COM   ',
-            phone         => '',
-            category      => 'Street lighting',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => {
-            name  => 'Bob Jones',
-            username => 'bob@example.com',
-        },
-        errors => [ 'Please enter a subject', 'Please enter some details', ],
-    },
-    {
-        msg    => 'non-photo upload gives error',
-        pc     => 'SW1A 1AA',
-        fields => {
-            title         => 'Title',
-            detail        => 'Detail',
-            photo1        => [ [ undef, 'bad.txt', Content => 'This is not a JPEG', Content_Type => 'text/plain' ], 1 ],
-            photo2        => '',
-            photo3        => '',
-            name          => 'Bob Jones',
-            may_show_name => '1',
-            username      => 'bob@example.com',
-            phone         => '',
-            category      => 'Street lighting',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => {
-            photo1 => '',
-        },
-        errors => [ "Please upload an image only" ],
-    },
-    {
-        msg    => 'bad photo upload gives error',
-        pc     => 'SW1A 1AA',
-        fields => {
-            title         => 'Title',
-            detail        => 'Detail',
-            photo1        => [ [ undef, 'fake.jpeg', Content => 'This is not a JPEG', Content_Type => 'image/jpeg' ], 1 ],
-            photo2        => '',
-            photo3        => '',
-            name          => 'Bob Jones',
-            may_show_name => '1',
-            username      => 'bob@example.com',
-            phone         => '',
-            category      => 'Street lighting',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => {
-            photo1 => '',
-        },
-        errors => [ "That image doesn't appear to have uploaded correctly (Please upload an image only ), please try again." ],
-    },
-    {
-        msg    => 'photo with octet-stream gets through okay',
-        pc     => 'SW1A 1AA',
-        fields => {
-            title         => '',
-            detail        => 'Detail',
-            photo1        => [ [ $sample_file, undef, Content_Type => 'application/octet-stream' ], 1 ],
-            photo2        => '',
-            photo3        => '',
-            name          => 'Bob Jones',
-            may_show_name => '1',
-            username      => 'bob@example.com',
-            phone         => '',
-            category      => 'Street lighting',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => {
-            photo1 => '',
-        },
-        errors => [ "Please enter a subject" ],
-    },
-    {
-        msg    => 'Bromley long detail',
-        pc     => 'BR1 3UH',
-        fields => {
-            fms_extra_title => 'MR',
-            title         => '',
-            detail        => 'X' . 'x' x 1751,
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => 'Bob Example',
-            may_show_name => '1',
-            username      => 'bob@example.com',
-            phone         => '',
-            category      => 'Trees',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => { },
-        errors => [ 'Please enter a subject', 'Reports are limited to 1750 characters in length. Please shorten your report' ],
-    },
-    {
-        msg    => 'Oxfordshire long detail',
-        pc     => 'OX20 1SZ',
-        fields => {
-            title         => '',
-            detail        => 'X' . 'x' x 1701,
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => 'Bob Example',
-            may_show_name => '1',
-            username      => 'bob@example.com',
-            phone         => '',
-            category      => 'Trees',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => { },
-        errors => [ 'Please enter a subject', 'Reports are limited to 1700 characters in length. Please shorten your report' ],
-    },
-    {
-        msg    => 'Lincolnshire long phone',
-        pc     => 'PE9 2GX',
-        fields => {
-            title         => '',
-            detail        => 'Detail',
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => 'Bob Example',
-            may_show_name => '1',
-            username      => 'bob@example.com',
-            phone         => '123456789 12345678910',
-            category      => 'Trees',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => { },
-        errors => [ 'Please enter a subject', 'Phone numbers are limited to 20 characters in length.' ],
-    },
-    {
-        msg    => 'Buckinghamshire long name',
-        pc     => 'RG9 6TL',
-        fields => {
-            title         => '',
-            detail        => '',
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => 'This is a very long name that should fail validation',
-            may_show_name => '1',
-            username      => 'bob@example.com',
-            phone         => '',
-            category      => 'Street lighting',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => { },
-        errors => [ 'Please enter a subject', 'Please enter some details', 'Names are limited to 50 characters in length.' ],
-    },
-    {
-        msg    => 'Rutland long name',
-        pc     => 'LE15 0GJ',
-        fields => {
-            title         => '',
-            detail        => '',
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => 'This is a very long name that should fail validation',
-            may_show_name => '1',
-            username      => 'bob@example.com',
-            phone         => '',
-            category      => 'Trees',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => { },
-        errors => [ 'Please enter a subject', 'Please enter some details', 'Names are limited to 40 characters in length.' ],
-    },
-    {
-        msg    => 'Oxfordshire validation',
-        pc     => 'OX20 1SZ',
-        fields => {
-            title         => '',
-            detail        => '',
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => 'This is a really extraordinarily long name that definitely should fail validation',
-            may_show_name => '1',
-            username      => 'bob.has.a.very.long.email@thisisalonghostname.example.com',
-            phone         => '01234 5678910 09876 54321 ext 203',
-            category      => 'Trees',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => { },
-        errors => [ 'Please enter a subject', 'Please enter some details', 'Emails are limited to 50 characters in length.', 'Phone numbers are limited to 20 characters in length.', 'Names are limited to 50 characters in length.'],
-    },
-    {
-        msg    => 'Northamptonshire validation',
-        pc     => 'NN1 1NS',
-        fields => {
-            title         => 'This is a very long title that should fail the validation as it is really much too long to pass the validation of 120 characters',
-            detail        => '',
-            photo1        => '',
-            photo2        => '',
-            photo3        => '',
-            name          => 'A User',
-            may_show_name => '1',
-            username      => 'user@example.org',
-            phone         => '',
-            category      => 'Trees',
-            password_sign_in => '',
-            password_register => '',
-        },
-        changes => { },
-        errors => [ 'Summaries are limited to 120 characters in length. Please shorten your summary', 'Please enter some details'],
-    },
-  )
-{
-    subtest "check form errors where $test->{msg}" => sub {
-        $mech->get_ok('/around');
-
-        # submit initial pc form
-        FixMyStreet::override_config {
-            ALLOWED_COBRANDS => [ { fixmystreet => '.' }, 'bromley', 'oxfordshire', 'rutland', 'lincolnshire', 'buckinghamshire', 'northamptonshire' ],
-            MAPIT_URL => 'http://mapit.uk/',
-        }, sub {
-            $mech->submit_form_ok( { with_fields => { pc => $test->{pc} } },
-                "submit location" );
-            is_deeply $mech->page_errors, [], "no errors for pc '$test->{pc}'";
-
-            # click through to the report page
-            $mech->follow_link_ok( { text_regex => qr/skip this step/i, },
-                "follow 'skip this step' link" );
-
-            # submit the main form
-            $mech->submit_form_ok( { with_fields => $test->{fields} },
-                "submit form" );
-        };
-
-        # check that we got the errors expected
-        is_deeply [ sort @{$mech->page_errors} ], [ sort @{$test->{errors}} ], "check errors";
-
-        # check that fields have changed as expected
-        my $new_values = {
-            %{ $test->{fields} },     # values added to form
-            %{ $test->{changes} },    # changes we expect
-        };
-        is_deeply $mech->visible_form_values, $new_values,
-          "values correctly changed";
-    };
-}
-
 my $first_user;
 foreach my $test (
     {
@@ -702,14 +119,14 @@ foreach my $test (
     # check that the user does not exist
     my $test_email = 'test-1@example.com';
     if ($test->{user}) {
-        my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+        my $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
         ok $user, "test user does exist";
         $user->problems->delete;
         $user->name( 'Old Name' );
         $user->password( 'old_password' );
         $user->update;
     } elsif (!$first_user) {
-        ok !FixMyStreet::App->model('DB::User')->find( { email => $test_email } ),
+        ok !FixMyStreet::DB->resultset('User')->find( { email => $test_email } ),
           "test user does not exist";
         $first_user = 1;
     } else {
@@ -754,7 +171,7 @@ foreach my $test (
 
     # check that the user has been created/ not changed
     my $user =
-      FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+      FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
     ok $user, "user found";
     if ($test->{user}) {
         is $user->name, 'Old Name', 'name unchanged';
@@ -799,7 +216,7 @@ foreach my $test (
     }
 
     # check that the reporter has an alert
-    my $alert = FixMyStreet::App->model('DB::Alert')->find( {
+    my $alert = FixMyStreet::DB->resultset('Alert')->find( {
         user       => $report->user,
         alert_type => 'new_updates',
         parameter  => $report->id,
@@ -815,65 +232,10 @@ foreach my $test (
   };
 }
 
-# this test to make sure that we don't see spurious error messages about
-# the name being blank when there is a sign in error
-subtest "test password errors for a user who is signing in as they report" => sub {
-    $mech->log_out_ok;
-    $mech->clear_emails_ok;
-
-    # check that the user does not exist
-    my $test_email = 'test-2@example.com';
-
-    my $user = $mech->create_user_ok($test_email);
-
-    # setup the user.
-    ok $user->update( {
-        name     => 'Joe Bloggs',
-        phone    => '01234 567 890',
-        password => 'secret2',
-        phone_verified => 1,
-    } ), "set user details";
-
-    # submit initial pc form
-    $mech->get_ok('/around');
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.uk/',
-    }, sub {
-        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } },
-            "submit location" );
-
-        # click through to the report page
-        $mech->follow_link_ok( { text_regex => qr/skip this step/i, },
-            "follow 'skip this step' link" );
-
-        $mech->submit_form_ok(
-            {
-                button      => 'submit_sign_in',
-                with_fields => {
-                    title         => 'Test Report',
-                    detail        => 'Test report details.',
-                    photo1        => '',
-                    username      => 'test-2@example.com',
-                    password_sign_in => 'secret1',
-                    category      => 'Street lighting',
-                }
-            },
-            "submit with wrong password"
-        );
-    };
-
-    # check that we got the errors expected
-    is_deeply $mech->page_errors, [
-        "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the \x{2018}No\x{2019} section of the form.",
-    ], "check there were errors";
-
-    $mech->content_lacks('1234', 'phone number not shown');
-};
-
 foreach my $test (
-  { two_factor => 0, desc => '', },
-  { two_factor => 1, desc => ' with two-factor', },
+  { two_factor => '', desc => '', },
+  { two_factor => 'yes', desc => ' with two-factor', },
+  { two_factor => 'new', desc => ' with mandated two-factor, not yet set up', },
 ) {
   subtest "test report creation for a user who is signing in as they report$test->{desc}" => sub {
     $mech->log_out_ok;
@@ -890,21 +252,25 @@ foreach my $test (
         name     => 'Joe Bloggs',
         phone    => '01234 567 890',
         password => 'secret2',
+        $test->{two_factor} ? (is_superuser => 1) : (),
     } ), "set user details";
 
     my $auth;
-    if ($test->{two_factor}) {
+    my $mock;
+    if ($test->{two_factor} eq 'yes') {
         use Auth::GoogleAuth;
         $auth = Auth::GoogleAuth->new;
-        $user->is_superuser(1);
         $user->set_extra_metadata('2fa_secret', $auth->generate_secret32);
         $user->update;
+    } elsif ($test->{two_factor} eq 'new') {
+        $mock = Test::MockModule->new('FixMyStreet::Cobrand::FixMyStreet');
+        $mock->mock(must_have_2fa => sub { 1 });
     }
 
     # submit initial pc form
     $mech->get_ok('/around');
     FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
+        ALLOWED_COBRANDS => 'fixmystreet',
         MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } },
@@ -921,7 +287,7 @@ foreach my $test (
                     title         => 'Test Report',
                     detail        => 'Test report details.',
                     photo1        => '',
-                    username      => $test_email,
+                    username      => $user->email,
                     password_sign_in => 'secret2',
                     category      => 'Street lighting',
                 }
@@ -929,13 +295,22 @@ foreach my $test (
             "submit good details"
         );
 
-        if ($test->{two_factor}) {
+        if ($test->{two_factor} eq 'yes') {
             my $code = $auth->code;
             my $wrong_code = $auth->code(undef, time() - 120);
             $mech->content_contains('Please generate a two-factor code');
             $mech->submit_form_ok({ with_fields => { '2fa_code' => $wrong_code } }, "provide wrong 2FA code" );
             $mech->content_contains('Try again');
             $mech->submit_form_ok({ with_fields => { '2fa_code' => $code } }, "provide correct 2FA code" );
+        } elsif ($test->{two_factor} eq 'new') {
+            $mech->content_contains('requires two-factor');
+            $mech->submit_form_ok({ with_fields => { '2fa_action' => 'activate' } }, "submit 2FA activation");
+            my ($token) = $mech->content =~ /name="secret32" value="([^"]*)">/;
+
+            use Auth::GoogleAuth;
+            my $auth = Auth::GoogleAuth->new({ secret32 => $token });
+            my $code = $auth->code;
+            $mech->submit_form_ok({ with_fields => { '2fa_code' => $code } }, "provide correct 2FA code" );
         }
 
         # check that we got the message expected
@@ -956,7 +331,7 @@ foreach my $test (
     my $report = $user->problems->first;
     ok $report, "Found the report";
 
-    if (!$test->{two_factor}) {
+    if ($test->{two_factor} eq '') {
         # The superuser account will be immediately redirected
         $mech->content_contains('Thank you for reporting this issue');
     }
@@ -972,7 +347,7 @@ foreach my $test (
     $mech->get_ok( '/report/' . $report->id );
 
     # check that the reporter has an alert
-    my $alert = FixMyStreet::App->model('DB::Alert')->find( {
+    my $alert = FixMyStreet::DB->resultset('Alert')->find( {
         user       => $report->user,
         alert_type => 'new_updates',
         parameter  => $report->id,
@@ -1073,7 +448,7 @@ foreach my $test (
         $mech->get_ok( '/report/' . $report->id );
 
         # check that the reporter has an alert
-        my $alert = FixMyStreet::App->model('DB::Alert')->find( {
+        my $alert = FixMyStreet::DB->resultset('Alert')->find( {
             user       => $report->user,
             alert_type => 'new_updates',
             parameter  => $report->id,
@@ -1258,16 +633,18 @@ subtest "Test inactive categories" => sub {
 };
 
 subtest "category groups" => sub {
-    my $cobrand = Test::MockModule->new('FixMyStreet::Cobrand::FixMyStreet');
-    $cobrand->mock('enable_category_groups', sub { 1 });
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => 'fixmystreet',
         MAPIT_URL => 'http://mapit.uk/',
+        COBRAND_FEATURES => {
+            category_groups => { fixmystreet => 1 }
+        }
     }, sub {
-        $contact2->update( { extra => { group => 'Roads' } } );
+        $contact2->update( { extra => { group => ['Roads','Pavements'] } } );
         $contact9->update( { extra => { group => 'Roads' } } );
         $contact10->update( { extra => { group => 'Roads' } } );
         $mech->get_ok("/report/new?lat=$saved_lat&lon=$saved_lon");
+        $mech->content_like(qr{<optgroup label="Pavements">\s*<option value='Potholes'>Potholes</option></optgroup>});
         $mech->content_like(qr{<optgroup label="Roads">\s*<option value='Potholes'>Potholes</option>\s*<option value='Street lighting'>Street lighting</option></optgroup>});
     };
 };
@@ -1303,7 +680,7 @@ subtest "test report creation for a category that is non public" => sub {
                     title         => 'Test Report',
                     detail        => 'Test report details.',
                     photo1        => '',
-                    username      => 'test-2@example.com',
+                    username      => $user->email,
                     name          => 'Joe Bloggs',
                     category      => 'Street lighting',
                 }
@@ -1343,7 +720,7 @@ subtest "test report creation for a category that is non public" => sub {
     $contact1->update( { non_public => 0 } );
 };
 
-$contact2->category( "Pothol\xc3\xa9s" );
+$contact2->category( "Pothol\x{00E9}s" );
 $contact2->update;
 
 subtest "check map click ajax response" => sub {
@@ -1387,48 +764,50 @@ subtest "check map click ajax response" => sub {
     is $extra_details->{category}, '', 'category is empty for council with no contacts';
     is_deeply $extra_details->{bodies}, [ "Sandwell Borough Council" ], 'correct bodies for council with no contacts';
     ok !$extra_details->{extra_name_info}, 'no extra name info';
-};
-
-#### test uploading an image
 
-#### test completing a partial report (eq flickr upload)
-
-#### possibly manual testing
-# create report without using map
-# create report by clicking on map with javascript off
-# create report with images off
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => 'hounslow',
+        MAPIT_URL => 'http://mapit.uk/',
+    }, sub {
+        $extra_details = $mech->get_ok_json( '/report/new/ajax?latitude=51.482286&longitude=-0.328163' );
+    };
+    is_deeply $extra_details->{display_names}, { 'Hounslow Borough Council' => 'Hounslow Highways' }, 'council display name mapping correct';
 
-subtest "check that a lat/lon off coast leads to /around" => sub {
-    my $off_coast_latitude  = 50.78301;
-    my $off_coast_longitude = -0.646929;
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => 'hounslownoname',
+        MAPIT_URL => 'http://mapit.uk/',
+    }, sub {
+        $extra_details = $mech->get_ok_json( '/report/new/ajax?latitude=51.482286&longitude=-0.328163' );
+    };
+    isnt defined $extra_details->{display_names}, 'no council display names if none defined';
 
     FixMyStreet::override_config {
+        ALLOWED_COBRANDS => 'hounslow',
         MAPIT_URL => 'http://mapit.uk/',
     }, sub {
-        $mech->get_ok(    #
-            "/report/new"
-              . "?latitude=$off_coast_latitude"
-              . "&longitude=$off_coast_longitude"
-        );
+        $extra_details = $mech->get_ok_json( '/report/new/ajax?latitude=51.482286&longitude=-0.328163' );
     };
+    ok $extra_details->{by_category}->{'General Enquiry'}->{non_public}, 'non_public set correctly for private category';
+    isnt defined $extra_details->{by_category}->{Tree}->{non_public}, 'non_public omitted for public category';
+};
 
-    is $mech->uri->path, '/around', "redirected to '/around'";
+#### test uploading an image
 
-    is_deeply         #
-      $mech->page_errors,
-      [ 'That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again.' ],
-      "Found location error";
+#### test completing a partial report (eq flickr upload)
 
-};
+#### possibly manual testing
+# create report without using map
+# create report by clicking on map with javascript off
+# create report with images off
 
 subtest "check we load a partial report correctly" => sub {
-    my $user = FixMyStreet::App->model('DB::User')->find_or_create(
+    my $user = FixMyStreet::DB->resultset('User')->find_or_create(
         {
             email => 'test-partial@example.com'
         }
     );
 
-    my $report = FixMyStreet::App->model('DB::Problem')->create( {
+    my $report = FixMyStreet::DB->resultset('Problem')->create( {
         name               => '',
         postcode           => '',
         category           => 'Street lighting',
@@ -1447,7 +826,7 @@ subtest "check we load a partial report correctly" => sub {
 
     my $report_id = $report->id;
 
-    my $token = FixMyStreet::App->model("DB::Token")
+    my $token = FixMyStreet::DB->resultset("Token")
         ->create( { scope => 'partial', data => $report->id } );
 
     my $token_code = $token->token;
@@ -1593,7 +972,7 @@ for my $test (
         # confirm token in order to update the user details
         $mech->get_ok($url);
 
-        my $user = FixMyStreet::App->model('DB::User')->find( { email => 'firstlast@example.com' } );
+        my $user = FixMyStreet::DB->resultset('User')->find( { email => 'firstlast@example.com' } );
 
         my $report = $user->problems->first;
         ok $report, "Found the report";
@@ -1732,7 +1111,7 @@ subtest "test Hart" => sub {
 
             # check that the user has been created/ not changed
             $user =
-              FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+              FixMyStreet::DB->resultset('User')->find( { email => $user ? $user->email : $test_email } );
             ok $user, "user found";
 
             # find the report
@@ -1822,151 +1201,6 @@ subtest "categories from deleted bodies shouldn't be visible for new reports" =>
     };
 };
 
-subtest "unresponsive body handling works" => sub {
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.uk/',
-    }, sub {
-        # Test body-level send method
-        my $old_send = $contact1->body->send_method;
-        $contact1->body->update( { send_method => 'Refused' } );
-        my $body_id = $contact1->body->id;
-        my $extra_details = $mech->get_ok_json('/report/new/ajax?latitude=55.952055&longitude=-3.189579');
-        like $extra_details->{top_message}, qr{Edinburgh.*accept reports.*/unresponsive\?body=$body_id};
-        is_deeply $extra_details->{unresponsive}, { $body_id => 1 }, "unresponsive json set";
-        $extra_details = $mech->get_ok_json('/report/new/category_extras?category=Street%20lighting&latitude=55.952055&longitude=-3.189579');
-        is_deeply $extra_details->{unresponsive}, { $body_id => 1 }, "unresponsive json set";
-
-        my $test_email = 'test-2@example.com';
-        $mech->log_out_ok;
-        $mech->get_ok('/around');
-        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } }, "submit location" );
-        $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" );
-        $mech->submit_form_ok(
-            {
-                with_fields => {
-                    title         => "Test Report at café",
-                    detail        => 'Test report details.',
-                    photo1        => '',
-                    name          => 'Joe Bloggs',
-                    username      => $test_email,
-                    may_show_name => '1',
-                    phone         => '07903 123 456',
-                    category      => 'Trees',
-                }
-            },
-            "submit good details"
-        );
-
-        my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
-        ok $user, "test user does exist";
-
-        my $report = $user->problems->first;
-        ok $report, "Found the report";
-        is $report->bodies_str, undef, "Report not going anywhere";
-
-        like $mech->get_text_body_from_email, qr/despite not being sent/i, "correct email sent";
-
-        $user->problems->delete;
-        $mech->clear_emails_ok;
-
-        # Make sure the same behaviour occurs for reports from the mobile app
-        $mech->log_out_ok;
-        $mech->post_ok( '/report/new/mobile', {
-            title               => "Test Report at café",
-            detail              => 'Test report details.',
-            photo1              => '',
-            name                => 'Joe Bloggs',
-            email               => $test_email,
-            may_show_name       => '1',
-            phone               => '07903 123 456',
-            category            => 'Trees',
-            service             => 'iOS',
-            lat                 => 55.952055,
-            lon                 => -3.189579,
-            pc                  => '',
-            used_map            => '1',
-            submit_register     => '1',
-            password_register   => '',
-        });
-        my $res = $mech->response;
-        ok $res->header('Content-Type') =~ m{^application/json\b}, 'response should be json';
-
-        $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
-        ok $user, "test user does exist";
-
-        $report = $user->problems->first;
-        ok $report, "Found the report";
-        is $report->bodies_str, undef, "Report not going anywhere";
-
-        like $mech->get_text_body_from_email, qr/despite not being sent/i, "correct email sent";
-
-        $user->problems->delete;
-        $mech->clear_emails_ok;
-
-        $contact1->body->update( { send_method => $old_send } );
-
-        # And test per-category refusing
-        my $old_email = $contact3->email;
-        $contact3->update( { email => 'REFUSED' } );
-        $extra_details = $mech->get_ok_json('/report/new/ajax?latitude=51.896268&longitude=-2.093063');
-        like $extra_details->{by_category}{$contact3->category}{category_extra}, qr/Cheltenham.*Trees.*unresponsive.*category=Trees/s;
-        $extra_details = $mech->get_ok_json('/report/new/category_extras?category=Trees&latitude=51.896268&longitude=-2.093063');
-        is_deeply $extra_details->{unresponsive}, { $contact3->body->id => 1 }, "unresponsive json set";
-
-        $mech->get_ok('/around');
-        $mech->submit_form_ok( { with_fields => { pc => 'GL50 2PR', } }, "submit location" );
-        $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" );
-        $mech->submit_form_ok(
-            {
-                with_fields => {
-                    title         => "Test Report at café",
-                    detail        => 'Test report details.',
-                    photo1        => '',
-                    name          => 'Joe Bloggs',
-                    username      => $test_email,
-                    may_show_name => '1',
-                    phone         => '07903 123 456',
-                    category      => 'Trees',
-                }
-            },
-            "submit good details"
-        );
-
-        $report = $user->problems->first;
-        ok $report, "Found the report";
-        is $report->bodies_str, undef, "Report not going anywhere";
-
-        $contact3->update( { email => $old_email } );
-        $mech->delete_user($user);
-    };
-};
-
-subtest "unresponsive body page works" => sub {
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-    }, sub {
-        my $old_send = $contact1->body->send_method;
-        my $body_id = $contact1->body->id;
-        my $url = "/unresponsive?body=$body_id";
-        is $mech->get($url)->code, 404, "page not found";
-        $contact1->body->update( { send_method => 'Refused' } );
-        $mech->get_ok($url);
-        $mech->content_contains('Edinburgh');
-        $contact1->body->update( { send_method => $old_send } );
-
-        my $old_email = $contact3->email;
-        $body_id = $contact3->body->id;
-        $url = "/unresponsive?body=$body_id;category=Trees";
-        is $mech->get($url)->code, 404, "page not found";
-        $contact3->update( { email => 'REFUSED' } );
-        $mech->get_ok($url);
-        $mech->content_contains('Cheltenham');
-        $mech->content_contains('Trees');
-        $contact3->update( { email => $old_email } );
-    };
-};
-
 subtest "extra google analytics code displayed on logged in problem creation" => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
@@ -2066,7 +1300,7 @@ subtest "extra google analytics code displayed on email confirmation problem cre
         $mech->get_ok($url);
 
         # find the report
-        my $user = FixMyStreet::App->model('DB::User')->find( { email => 'firstlast@example.com' } );
+        my $user = FixMyStreet::DB->resultset('User')->find( { email => 'firstlast@example.com' } );
 
         my $report = $user->problems->first;
         ok $report, "Found the report";
@@ -2077,207 +1311,4 @@ subtest "extra google analytics code displayed on email confirmation problem cre
     };
 };
 
-
-my $private_perms = $mech->create_user_ok('private_perms@example.org', name => 'private', from_body => $bodies[0]);
-subtest "report_mark_private allows users to mark reports as private" => sub {
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        BASE_URL => 'https://www.fixmystreet.com',
-        MAPIT_URL => 'http://mapit.uk/',
-    }, sub {
-        $mech->log_out_ok;
-
-        $private_perms->user_body_permissions->find_or_create({
-            body => $bodies[0],
-            permission_type => 'report_mark_private',
-        });
-
-        $mech->log_in_ok('private_perms@example.org');
-        $mech->get_ok('/');
-        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB' } },
-            "submit location" );
-        $mech->follow_link_ok(
-            { text_regex => qr/skip this step/i, },
-            "follow 'skip this step' link"
-        );
-
-        $mech->submit_form_ok(
-            {
-                with_fields => {
-                    title         => "Private report",
-                    detail        => 'Private report details.',
-                    photo1        => '',
-                    name          => 'Joe Bloggs',
-                    may_show_name => '1',
-                    phone         => '07903 123 456',
-                    category      => 'Trees',
-                    non_public    => 1,
-                }
-            },
-            "submit good details"
-        );
-
-        $mech->content_contains('Great work. Now spread the word', 'shown confirmation page');
-    }
-};
-
-my $inspector = $mech->create_user_ok('inspector@example.org', name => 'inspector', from_body => $bodies[0]);
-foreach my $test (
-  { non_public => 0 },
-  { non_public => 1 },
-) {
-  subtest "inspectors get redirected directly to the report page, non_public=$test->{non_public}" => sub {
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        BASE_URL => 'https://www.fixmystreet.com',
-        MAPIT_URL => 'http://mapit.uk/',
-    }, sub {
-        $mech->log_out_ok;
-
-        $inspector->user_body_permissions->find_or_create({
-            body => $bodies[0],
-            permission_type => 'planned_reports',
-        });
-        $inspector->user_body_permissions->find_or_create({
-            body => $bodies[0],
-            permission_type => 'report_inspect',
-        });
-
-        $mech->log_in_ok('inspector@example.org');
-        $mech->get_ok('/');
-        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB' } },
-            "submit location" );
-        $mech->follow_link_ok(
-            { text_regex => qr/skip this step/i, },
-            "follow 'skip this step' link"
-        );
-
-        $mech->submit_form_ok(
-            {
-                with_fields => {
-                    title         => "Inspector report",
-                    detail        => 'Inspector report details.',
-                    photo1        => '',
-                    name          => 'Joe Bloggs',
-                    may_show_name => '1',
-                    phone         => '07903 123 456',
-                    category      => 'Trees',
-                    non_public => $test->{non_public},
-                }
-            },
-            "submit good details"
-        );
-
-        like $mech->uri->path, qr/\/report\/[0-9]+/, 'Redirects directly to report';
-    }
-  };
-}
-
-subtest "check map click ajax response for inspector" => sub {
-    $mech->log_out_ok;
-
-    my $extra_details;
-    $inspector->user_body_permissions->find_or_create({
-        body => $bodies[0],
-        permission_type => 'planned_reports',
-    });
-    $inspector->user_body_permissions->find_or_create({
-        body => $bodies[0],
-        permission_type => 'report_inspect',
-    });
-
-    $mech->log_in_ok('inspector@example.org');
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.uk/',
-    }, sub {
-        $extra_details = $mech->get_ok_json( '/report/new/ajax?latitude=55.952055&longitude=-3.189579' );
-    };
-    like $extra_details->{category}, qr/data-prefill="0/, 'inspector prefill not set';
-    ok !$extra_details->{contribute_as}, 'no contribute as section';
-};
-
-subtest "check map click ajax response for inspector and uk cobrand" => sub {
-    $mech->log_out_ok;
-
-    my $extra_details;
-    $inspector->user_body_permissions->find_or_create({
-        body => $bodies[4],
-        permission_type => 'planned_reports',
-    });
-    $inspector->user_body_permissions->find_or_create({
-        body => $bodies[4],
-        permission_type => 'report_inspect',
-    });
-
-    $mech->log_in_ok('inspector@example.org');
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ { bromley => '.' } ],
-        MAPIT_URL => 'http://mapit.uk/',
-    }, sub {
-        $extra_details = $mech->get_ok_json( '/report/new/ajax?latitude=51.402096&longitude=0.015784' );
-    };
-    like $extra_details->{category}, qr/data-prefill="0/, 'inspector prefill not set';
-};
-
-for my $test (
-    {
-        desc => 'map click ajax for contribute_as_another_user',
-        permissions => {
-            contribute_as_another_user => 1,
-            contribute_as_anonymous_user => undef,
-            contribute_as_body => undef,
-        }
-    },
-    {
-        desc => 'map click ajax for contribute_as_anonymous_user',
-        permissions => {
-            contribute_as_another_user => undef,
-            contribute_as_anonymous_user => 1,
-            contribute_as_body => undef,
-        }
-    },
-    {
-        desc => 'map click ajax for contribute_as_body',
-        permissions => {
-            contribute_as_another_user => undef,
-            contribute_as_anonymous_user => undef,
-            contribute_as_body => 1,
-        }
-    },
-) {
-    subtest $test->{desc} => sub {
-        $mech->log_out_ok;
-        my $extra_details;
-        (my $name = $test->{desc}) =~ s/.*(contri.*)/$1/;
-        my $user = $mech->create_user_ok("$name\@example.org", name => 'test user', from_body => $bodies[0]);
-        for my $p ( keys %{$test->{permissions}} ) {
-            next unless $test->{permissions}->{$p};
-            $user->user_body_permissions->find_or_create({
-                body => $bodies[0],
-                permission_type => $p,
-            });
-        }
-        $mech->log_in_ok("$name\@example.org");
-        FixMyStreet::override_config {
-            ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-            MAPIT_URL => 'http://mapit.uk/',
-        }, sub {
-            $extra_details = $mech->get_ok_json( '/report/new/ajax?latitude=55.952055&longitude=-3.189579' );
-        };
-        for my $p ( keys %{$test->{permissions}} ) {
-            (my $key = $p) =~ s/contribute_as_//;
-            is $extra_details->{contribute_as}->{$key}, $test->{permissions}->{$p}, "$key correctly set";
-        }
-
-        FixMyStreet::override_config {
-            ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-            MAPIT_URL => 'http://mapit.uk/',
-        }, sub {
-            $extra_details = $mech->get_ok_json( '/report/new/ajax?latitude=51.754926&longitude=-1.256179' );
-        };
-        ok !$extra_details->{contribute_as}, 'no contribute as section for other council';
-    };
-}
-
 done_testing();