Convert remaining user tests to the newer test API

Author: carols10cents

src/tests/all.rs

@@ -17,7 +17,6 @@ extern crate serde_json;
 
 use crate::util::{Bad, RequestHelper, TestApp};
 use cargo_registry::{
-    middleware::current_user::AuthenticationSource,
     models::{Crate, CrateOwner, Dependency, NewCategory, NewTeam, NewUser, Team, User, Version},
     schema::crate_owners,
     util::CargoResult,
@@ -35,7 +34,6 @@ use std::{
     },
 };
 
-use conduit::Request;
 use conduit_test::MockRequest;
 use diesel::prelude::*;
 use reqwest::{Client, Proxy};
@@ -50,26 +48,6 @@ macro_rules! t {
     };
 }
 
-macro_rules! ok_resp {
-    ($e:expr) => {{
-        let resp = t!($e);
-        if !crate::ok_resp(&resp) {
-            panic!("bad response: {:?}", resp.status);
-        }
-        resp
-    }};
-}
-
-macro_rules! bad_resp {
-    ($e:expr) => {{
-        let mut resp = t!($e);
-        match crate::bad_resp(&mut resp) {
-            None => panic!("ok response: {:?}", resp.status),
-            Some(b) => b,
-        }
-    }};
-}
-
 mod badge;
 mod builders;
 mod categories;
@@ -274,12 +252,6 @@ fn add_team_to_crate(t: &Team, krate: &Crate, u: &User, conn: &PgConnection) ->
     Ok(())
 }
 
-fn sign_in_as(req: &mut dyn Request, user: &User) {
-    req.mut_extensions().insert(user.clone());
-    req.mut_extensions()
-        .insert(AuthenticationSource::SessionCookie);
-}
-
 fn new_dependency(conn: &PgConnection, version: &Version, krate: &Crate) -> Dependency {
     use cargo_registry::schema::dependencies::dsl::*;
     use diesel::insert_into;
@@ -305,10 +277,6 @@ fn new_category<'a>(category: &'a str, slug: &'a str, description: &'a str) -> N
     }
 }
 
-fn logout(req: &mut dyn Request) {
-    req.mut_extensions().pop::<User>();
-}
-
 #[test]
 fn multiple_live_references_to_the_same_connection_can_be_checked_out() {
     use std::ptr;