Prevent previous commit issue ever happening again.

2 files changed, 14 insertions, 6 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;
diff --git a/t/app/model/user.t b/t/app/model/user.t
index 5a9c898a2..cbc0fe6cf 100644
--- a/t/app/model/user.t
+++ b/t/app/model/user.t
@@ -1,5 +1,8 @@
 use FixMyStreet::TestMech;
 use FixMyStreet::DB;
+use Catalyst::Test 'FixMyStreet::App';
+use HTTP::Request::Common;
+use Test::Exception;
 
 my $mech = FixMyStreet::TestMech->new();
 $mech->log_in_ok('test@example.com');
@@ -63,9 +66,16 @@ FixMyStreet::override_config {
     $mech->content_like(qr/may_show_name[^>c]*>/);
 };
 
-END {
-    done_testing();
-}
+subtest 'Check non-existent methods on user object die' => sub {
+    my $c = ctx_request(POST '/auth', { username => 'test@example.com', password_sign_in => 'secret' });
+    throws_ok(
+        sub { $c->user->is_super_user },
+        qr/Can't locate object method 'is_super_user'/,
+        'attempt to call non-existent method'
+    );
+};
+
+done_testing();
 
 sub create_update {
     my ($problem, %params) = @_;