Auto merge of #3217 - Turbo87:req, r=locks

tests: Move `req()` function to `util` module

The `req()` function does not seem to be used anywhere else, so it's probably easiest to keep it in the same module as where it is used.

r? `@pietroalbini`

Author: bors

src/tests/all.rs

@@ -32,8 +32,7 @@ use std::{
     },
 };
 
-use conduit::{header, Body};
-use conduit_test::MockRequest;
+use conduit::Body;
 use diesel::prelude::*;
 use reqwest::{blocking::Client, Proxy};
 
@@ -178,12 +177,6 @@ fn env(var: &str) -> String {
     }
 }
 
-fn req(method: conduit::Method, path: &str) -> MockRequest {
-    let mut request = MockRequest::new(method, path);
-    request.header(header::USER_AGENT, "conduit-test");
-    request
-}
-
 fn json<T>(r: &mut AppResponse) -> T
 where
     for<'de> T: serde::Deserialize<'de>,

src/tests/util.rs

@@ -431,14 +431,20 @@ pub trait RequestHelper {
     }
 }
 
+fn req(method: conduit::Method, path: &str) -> MockRequest {
+    let mut request = MockRequest::new(method, path);
+    request.header(header::USER_AGENT, "conduit-test");
+    request
+}
+
 /// A type that can generate unauthenticated requests
 pub struct MockAnonymousUser {
     app: TestApp,
 }
 
 impl RequestHelper for MockAnonymousUser {
     fn request_builder(&self, method: Method, path: &str) -> MockRequest {
-        crate::req(method, path)
+        req(method, path)
     }
 
     fn app(&self) -> &TestApp {
@@ -457,7 +463,7 @@ pub struct MockCookieUser {
 
 impl RequestHelper for MockCookieUser {
     fn request_builder(&self, method: Method, path: &str) -> MockRequest {
-        let mut request = crate::req(method, path);
+        let mut request = req(method, path);
         let id = TrustedUserId(self.user.id);
         request.mut_extensions().insert(id);
         request
@@ -504,7 +510,7 @@ pub struct MockTokenUser {
 
 impl RequestHelper for MockTokenUser {
     fn request_builder(&self, method: Method, path: &str) -> MockRequest {
-        let mut request = crate::req(method, path);
+        let mut request = req(method, path);
         request.header(header::AUTHORIZATION, &self.token.plaintext);
         request
     }