1 files changed, 47 insertions, 61 deletions

diff --git a/t/app/model/token.t b/t/app/model/token.t
index 12945975e..e31901187 100644
--- a/t/app/model/token.t
+++ b/t/app/model/token.t
@@ -1,23 +1,10 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
-use Test::More tests => 45;
+use Test::More;
 
 use FixMyStreet;
-use FixMyStreet::App;
-use mySociety::AuthToken;
-use mySociety::DBHandle 'dbh';
-
-# set things up so that code using mySociety::DBHandle is happy
-FixMyStreet->configure_mysociety_dbhandle();
-
-# NOTE - remember that you need to explicitly dbh()->commit after making
-# database changes with the mySociety::* modules.
-
-# create a token using DBIC and check we can read it using AuthToken, and vice
-# versa
+use FixMyStreet::DB;
 
 my %tests = (
     nested_hash => { foo => 'bar', and => [ 'baz', 'bundy' ] },
@@ -25,72 +12,71 @@ my %tests = (
     scalar => 123,
 );
 
-my $token_rs = FixMyStreet::App->model('DB::Token');
+my $token_rs = FixMyStreet::DB->resultset('Token');
 
-# create using DBIC
 foreach my $test_data_name ( sort keys %tests ) {
     my $test_data = $tests{$test_data_name};
 
-    pass "--- testing DBIC create using '$test_data_name'";
+    pass "--- testing token creation using '$test_data_name'";
 
     my $dbic_token =
       $token_rs->create( { scope => 'testing', data => $test_data } );
     my $token = $dbic_token->token;
     ok $token, "stored token '$token'";
 
-    is_deeply $dbic_token->data, $test_data, "data stored correctly using DBIC";
+    is_deeply $dbic_token->data, $test_data, "data stored correctly";
 
-    # read back using DBIC
+    # read back from database
     is_deeply $token_rs->find( { token => $token, scope => 'testing' } )->data,
       $test_data,
-      "data read back correctly with DBIC";
-
-    # read back using mySociety::AuthToken
-    is_deeply mySociety::AuthToken::retrieve( 'testing', $token ),
-      $test_data, "data read back correctly with m::AT";
+      "data read back correctly";
 
     # delete token
     ok $dbic_token->delete, "delete token";
 
     is $token_rs->find( { token => $token, scope => 'testing' } ),
       undef,
-      "token gone for DBIC";
-
-    # read back using mySociety::AuthToken
-    is mySociety::AuthToken::retrieve( 'testing', $token ),
-      undef, "token gone with m::AT";
-
+      "token gone";
 }
 
-# create using m::AT
-foreach my $test_data_name ( sort keys %tests ) {
-    my $test_data = $tests{$test_data_name};
-
-    pass "--- testing m::AT create using '$test_data_name'";
-
-    my $token = mySociety::AuthToken::store( 'testing', $test_data );
-    dbh->commit();
-    ok $token, "stored token '$token'";
-
-    # read back using DBIC
-    is_deeply $token_rs->find( { token => $token, scope => 'testing' } )->data,
-      $test_data,
-      "data read back correctly with DBIC";
-
-    # read back using mySociety::AuthToken
-    is_deeply mySociety::AuthToken::retrieve( 'testing', $token ),
-      $test_data, "data read back correctly with m::AT";
-
-    # delete token
-    ok mySociety::AuthToken::destroy( 'testing', $token ), "destroy token";
-    dbh->commit();
-
-    is $token_rs->find( { token => $token, scope => 'testing' } ),
-      undef,
-      "token gone for DBIC";
-
-    # read back using mySociety::AuthToken
-    is mySociety::AuthToken::retrieve( 'testing', $token ),
-      undef, "token gone with m::AT";
+# Test that the inflation and deflation works as expected
+{
+    my $token =
+      $token_rs->create( { scope => 'testing', data => {} } );
+    END { $token->delete() };
+
+    # Add in temporary check to test that the data is updated as expected.
+    is_deeply($token->data, {}, "data is empty");
+
+    # store something in it
+    $token->update({ data => { foo => 'bar' } });
+    $token->discard_changes();
+    is_deeply($token->data, { foo => 'bar' }, "data has content");
+
+    # change the hash stored
+    $token->update({ data => { baz => 'bundy' } });
+    $token->discard_changes();
+    is_deeply($token->data, { baz => 'bundy' }, "data has new content");
+
+    # change the hashref in place
+    {
+        my $data = $token->data;
+        $data->{baz} = 'new';
+        $token->data( $data );
+        $token->update();
+        $token->discard_changes();
+        is_deeply($token->data, { baz => 'new' }, "data has been updated");
+    }
+
+    # change the hashref in place
+    {
+        my $data = $token->data;
+        $data->{baz} = 'new';
+        $token->update({ data => $data });
+        $token->discard_changes();
+        is_deeply($token->data, { baz => 'new' }, "data has been updated");
+    }
 
 }
+
+done_testing();