Update a number of packages.

Update:
    * Catalyst
        * Specify Catalyst::DispatchType::Regex explicitly
        * Remove Catalyst::Plugin::Unicode::Encoding
    * Catalyst::Plugin::SmartURI
        * Specify URI::SmartURI explicitly
    * Catalyst::Plugin::Static::Simple
    * CGI
    * Class::Load
    * DateTime
    * DateTime::TimeZone
    * DBD::Pg
    * DBIx::Class
    * DBIx::Class::EncodedColumn.
    * Email::Address.
    * Email::MIME
    * ExtUtils::MakeMaker
    * ExtUtils::ParseXS (for Params::Classify upgrade)
    * File::ChangeNotify
    * Image::Size
    * IO::Socket::SSL
    * local::lib
    * Moo
    * Moose (and some related others due to deprecations)
    * namespace::autoclean
    * Net::Server
    * Net::SSLeay
    * Number::Phone
    * Plack
    * Starman
    * Template
    * Test::PostgreSQL
    * Test::WWW::Mechanize::Catalyst
    * Text::CSV
    * YAML

carton install was run on a wheezy box, the oldest that is supported, to
make sure the required minimal vesions of core modules weren't removed
from the snapshot. Cpanel::JSON::XS, Devel::GlobalDestruction::XS, and
MooseX::NonMoose were then put back in the snapshot, in case another
system needs them (e.g. system Perl on Mac looks for MooseX::NonMoose).

1 files changed, 1 insertions, 3 deletions

diff --git a/t/app/controller/token.t b/t/app/controller/token.t
index 858838865..f7dec1a31 100644
--- a/t/app/controller/token.t
+++ b/t/app/controller/token.t
@@ -1,5 +1,4 @@
 use FixMyStreet::TestMech;
-use FixMyStreet::App;
 
 my $mech = FixMyStreet::TestMech->new;
 my $user = $mech->create_user_ok('bob@example.com', name => 'Bob');
@@ -8,7 +7,6 @@ subtest 'Zurich special case for C::Tokens->problem_confirm' => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => ['zurich'],
     }, sub {
-        my $c = FixMyStreet::App->new;
         my $zurich = $mech->create_body_ok( 1, 'Zurich' );
         my ($report) = $mech->create_problems_for_body( 
             1, $zurich->id,
@@ -19,7 +17,7 @@ subtest 'Zurich special case for C::Tokens->problem_confirm' => sub {
             });
         
         is $report->get_extra_metadata('email_confirmed'), undef, 'email_confirmed not yet set (sanity)';
-        my $token = $c->model('DB::Token')->create({ scope => 'problem', data => $report->id });
+        my $token = FixMyStreet::DB->resultset('Token')->create({ scope => 'problem', data => $report->id });
 
         $mech->get_ok('/P/' . $token->token);
         $report->discard_changes;