tests/util: Change MockTokenUser::token to be optional

Author: Turbo87

src/tests/util.rs

@@ -335,7 +335,7 @@ impl MockCookieUser {
 
         MockTokenUser {
             app: self.app.clone(),
-            token,
+            token: Some(token),
             plaintext: plaintext.expose_secret().into(),
         }
     }
@@ -344,7 +344,7 @@ impl MockCookieUser {
 /// A type that can generate token authenticated requests
 pub struct MockTokenUser {
     app: TestApp,
-    token: ApiToken,
+    token: Option<ApiToken>,
     plaintext: String,
 }
 
@@ -363,7 +363,8 @@ impl RequestHelper for MockTokenUser {
 impl MockTokenUser {
     /// Returns a reference to the database `ApiToken` model
     pub fn as_model(&self) -> &ApiToken {
-        &self.token
+        const ERROR: &str = "Original `ApiToken` was not set on this `MockTokenUser` instance";
+        self.token.as_ref().expect(ERROR)
     }
 
     pub fn plaintext(&self) -> &str {