Add TestApp::simple() for tests that don't need HTTP recording

The unused `Uploader::NoOp` option is now `Uploader::Panic` which
panics on any usage.  The panic message directs users to initialize the
app with `TestApp::full()`.

While this adds more panics to the main lib, the application
configuration isn't dynamic and it should be obvious that
`Uploader::Panic` is not to be used to configure a production
application.

Author: jtgeibel

src/app.rs

@@ -103,8 +103,8 @@ impl App {
     /// Returns a client for making HTTP requests to upload crate files.
     ///
     /// The handle will go through a proxy if the uploader being used has specified one, which
-    /// is only done in test mode in order to be able to record and inspect the HTTP requests
-    /// that tests make.
+    /// is only done in tests with `TestApp::full()` in order to be able to record and inspect
+    /// the HTTP requests that tests make.
     pub fn http_client(&self) -> CargoResult<reqwest::Client> {
         let mut builder = reqwest::Client::builder();
         if let Some(proxy) = self.config.uploader.proxy() {

src/tests/all.rs

@@ -134,26 +134,30 @@ fn app() -> (
     conduit_middleware::MiddlewareBuilder,
 ) {
     dotenv::dotenv().ok();
-    git::init();
 
     let (proxy, bomb) = record::proxy();
-
-    // When testing we route all API traffic over HTTP so we can
-    // sniff/record it, but everywhere else we use https
-    let api_protocol = String::from("http");
-
     let uploader = cargo_registry::Uploader::S3 {
         bucket: s3::Bucket::new(
             String::from("alexcrichton-test"),
             None,
             std::env::var("S3_ACCESS_KEY").unwrap_or_default(),
             std::env::var("S3_SECRET_KEY").unwrap_or_default(),
-            &api_protocol,
+            // When testing we route all API traffic over HTTP so we can
+            // sniff/record it, but everywhere else we use https
+            "http",
         ),
         proxy: Some(proxy),
         cdn: None,
     };
 
+    let (app, handler) = simple_app(uploader);
+    (bomb, app, handler)
+}
+
+fn simple_app(
+    uploader: cargo_registry::Uploader,
+) -> (Arc<App>, conduit_middleware::MiddlewareBuilder) {
+    git::init();
     let config = cargo_registry::Config {
         uploader,
         session_key: "test this has to be over 32 bytes long".to_string(),
@@ -165,13 +169,15 @@ fn app() -> (
         max_upload_size: 3000,
         max_unpack_size: 2000,
         mirror: Replica::Primary,
-        api_protocol,
+        // When testing we route all API traffic over HTTP so we can
+        // sniff/record it, but everywhere else we use https
+        api_protocol: String::from("http"),
     };
     let app = App::new(&config);
     t!(t!(app.diesel_database.get()).begin_test_transaction());
     let app = Arc::new(app);
     let handler = cargo_registry::build_handler(Arc::clone(&app));
-    (bomb, app, handler)
+    (app, handler)
 }
 
 // Return the environment variable only if it has been defined

src/tests/keyword.rs

@@ -19,7 +19,7 @@ struct GoodKeyword {
 #[test]
 fn index() {
     let url = "/api/v1/keywords";
-    let (app, anon) = TestApp::empty();
+    let (app, anon) = TestApp::simple().empty();
     let json: KeywordList = anon.get(url).good();
     assert_eq!(json.keywords.len(), 0);
     assert_eq!(json.meta.total, 0);
@@ -37,7 +37,7 @@ fn index() {
 #[test]
 fn show() {
     let url = "/api/v1/keywords/foo";
-    let (app, anon) = TestApp::empty();
+    let (app, anon) = TestApp::simple().empty();
     anon.get(url).assert_not_found();
 
     app.db(|conn| {
@@ -50,7 +50,7 @@ fn show() {
 #[test]
 fn uppercase() {
     let url = "/api/v1/keywords/UPPER";
-    let (app, anon) = TestApp::empty();
+    let (app, anon) = TestApp::simple().empty();
     anon.get(url).assert_not_found();
 
     app.db(|conn| {
@@ -62,7 +62,7 @@ fn uppercase() {
 
 #[test]
 fn update_crate() {
-    let (app, anon) = TestApp::empty();
+    let (app, anon) = TestApp::simple().empty();
     let cnt = |kw: &str| {
         let json: GoodKeyword = anon.get(&format!("/api/v1/keywords/{}", kw)).good();
         json.keyword.crates_cnt as usize

src/tests/krate.rs

@@ -78,7 +78,7 @@ impl ::util::MockTokenUser {
 #[test]
 fn index() {
     let url = "/api/v1/crates";
-    let (app, anon) = TestApp::empty();
+    let (app, anon) = TestApp::simple().empty();
     let json: CrateList = anon.get(url).good();
     assert_eq!(json.crates.len(), 0);
     assert_eq!(json.meta.total, 0);
@@ -551,7 +551,7 @@ fn yanked_versions_are_not_considered_for_max_version() {
 
 #[test]
 fn versions() {
-    let (app, anon) = TestApp::empty();
+    let (app, anon) = TestApp::simple().empty();
     app.db(|conn| {
         let u = new_user("foo").create_or_update(conn).unwrap();
         CrateBuilder::new("foo_versions", u.id)
@@ -923,7 +923,7 @@ fn valid_feature_names() {
 
 #[test]
 fn new_krate_too_big() {
-    let (_, _, user) = TestApp::with_user();
+    let (_, _, user) = TestApp::simple().with_user();
     let files = [("foo_big-1.0.0/big", &[b'a'; 2000] as &[_])];
     let builder = PublishBuilder::new("foo_big").files(&files);
 
@@ -1358,7 +1358,7 @@ fn dependencies() {
 
 #[test]
 fn diesel_not_found_results_in_404() {
-    let (_, _, user) = TestApp::with_user();
+    let (_, _, user) = TestApp::simple().with_user();
 
     user.get("/api/v1/crates/foo_following/following")
         .assert_not_found();
@@ -1500,7 +1500,7 @@ fn yank() {
 
 #[test]
 fn yank_not_owner() {
-    let (app, _, _, token) = TestApp::with_token();
+    let (app, _, _, token) = TestApp::simple().with_token();
     app.db(|conn| {
         let another_user = new_user("bar").create_or_update(conn).unwrap();
         CrateBuilder::new("foo_not", another_user.id).expect_build(conn);

src/tests/owners.rs

@@ -63,7 +63,7 @@ impl ::util::MockCookieUser {
 
 #[test]
 fn new_crate_owner() {
-    let (app, _, user1, token) = TestApp::with_token();
+    let (app, _, user1, token) = TestApp::full().with_token();
 
     // Create a crate under one user
     let crate_to_publish = PublishBuilder::new("foo_owner").version("1.0.0");

src/tests/token.rs

@@ -36,20 +36,20 @@ static NEW_BAR: &[u8] = br#"{ "api_token": { "name": "bar" } }"#;
 
 #[test]
 fn list_logged_out() {
-    let (_, anon) = TestApp::empty();
+    let (_, anon) = TestApp::simple().empty();
     anon.get(URL).assert_forbidden();
 }
 
 #[test]
 fn list_empty() {
-    let (_, _, user) = TestApp::with_user();
+    let (_, _, user) = TestApp::simple().with_user();
     let json: ListResponse = user.get(URL).good();
     assert_eq!(json.api_tokens.len(), 0);
 }
 
 #[test]
 fn list_tokens() {
-    let (app, _, user) = TestApp::with_user();
+    let (app, _, user) = TestApp::simple().with_user();
     let id = user.as_model().id;
     let tokens = app.db(|conn| {
         vec![
@@ -71,13 +71,13 @@ fn list_tokens() {
 
 #[test]
 fn create_token_logged_out() {
-    let (_, anon) = TestApp::empty();
+    let (_, anon) = TestApp::simple().empty();
     anon.put(URL, NEW_BAR).assert_forbidden();
 }
 
 #[test]
 fn create_token_invalid_request() {
-    let (_, _, user) = TestApp::with_user();
+    let (_, _, user) = TestApp::simple().with_user();
     let invalid = br#"{ "name": "" }"#;
     let json = user.put::<()>(URL, invalid).bad_with_status(400);
 
@@ -86,7 +86,7 @@ fn create_token_invalid_request() {
 
 #[test]
 fn create_token_no_name() {
-    let (_, _, user) = TestApp::with_user();
+    let (_, _, user) = TestApp::simple().with_user();
     let empty_name = br#"{ "api_token": { "name": "" } }"#;
     let json = user.put::<()>(URL, empty_name).bad_with_status(400);
 
@@ -95,7 +95,7 @@ fn create_token_no_name() {
 
 #[test]
 fn create_token_long_body() {
-    let (_, _, user) = TestApp::with_user();
+    let (_, _, user) = TestApp::simple().with_user();
     let too_big = &[5; 5192]; // Send a request with a 5kB body of 5's
     let json = user.put::<()>(URL, too_big).bad_with_status(400);
 
@@ -104,7 +104,7 @@ fn create_token_long_body() {
 
 #[test]
 fn create_token_exceeded_tokens_per_user() {
-    let (app, _, user) = TestApp::with_user();
+    let (app, _, user) = TestApp::simple().with_user();
     let id = user.as_model().id;
     app.db(|conn| {
         for i in 0..1000 {
@@ -118,7 +118,7 @@ fn create_token_exceeded_tokens_per_user() {
 
 #[test]
 fn create_token_success() {
-    let (app, _, user) = TestApp::with_user();
+    let (app, _, user) = TestApp::simple().with_user();
 
     let json: NewResponse = user.put(URL, NEW_BAR).good();
     assert_eq!(json.api_token.name, "bar");
@@ -133,7 +133,7 @@ fn create_token_success() {
 
 #[test]
 fn create_token_multiple_have_different_values() {
-    let (_, _, user) = TestApp::with_user();
+    let (_, _, user) = TestApp::simple().with_user();
     let first: NewResponse = user.put(URL, NEW_BAR).good();
     let second: NewResponse = user.put(URL, NEW_BAR).good();
 
@@ -142,7 +142,7 @@ fn create_token_multiple_have_different_values() {
 
 #[test]
 fn create_token_multiple_users_have_different_values() {
-    let (app, _, user1) = TestApp::with_user();
+    let (app, _, user1) = TestApp::simple().with_user();
     let first_token: NewResponse = user1.put(URL, NEW_BAR).good();
 
     let user2 = app.db_new_user("bar");
@@ -153,7 +153,7 @@ fn create_token_multiple_users_have_different_values() {
 
 #[test]
 fn cannot_create_token_with_token() {
-    let (_, _, _, token) = TestApp::with_token();
+    let (_, _, _, token) = TestApp::simple().with_token();
     let json = token
         .put::<()>(
             "/api/v1/me/tokens",
@@ -168,13 +168,13 @@ fn cannot_create_token_with_token() {
 
 #[test]
 fn revoke_token_non_existing() {
-    let (_, _, user) = TestApp::with_user();
+    let (_, _, user) = TestApp::simple().with_user();
     let _json: RevokedResponse = user.delete("/api/v1/me/tokens/5").good();
 }
 
 #[test]
 fn revoke_token_doesnt_revoke_other_users_token() {
-    let (app, _, user1, token) = TestApp::with_token();
+    let (app, _, user1, token) = TestApp::simple().with_token();
     let user1 = user1.as_model();
     let token = token.as_model();
     let user2 = app.db_new_user("baz");
@@ -201,7 +201,7 @@ fn revoke_token_doesnt_revoke_other_users_token() {
 
 #[test]
 fn revoke_token_success() {
-    let (app, _, user, token) = TestApp::with_token();
+    let (app, _, user, token) = TestApp::simple().with_token();
 
     // List tokens contains the token
     app.db(|conn| {
@@ -227,7 +227,7 @@ fn revoke_token_success() {
 #[test]
 fn token_gives_access_to_me() {
     let url = "/api/v1/me";
-    let (_, anon, user, token) = TestApp::with_token();
+    let (_, anon, user, token) = TestApp::simple().with_token();
 
     anon.get(url).assert_forbidden();
 
@@ -238,7 +238,7 @@ fn token_gives_access_to_me() {
 #[test]
 fn using_token_updates_last_used_at() {
     let url = "/api/v1/me";
-    let (app, anon, user, token) = TestApp::with_token();
+    let (app, anon, user, token) = TestApp::simple().with_token();
 
     anon.get(url).assert_forbidden();
     user.get::<EncodableMe>(url).good();

src/tests/user.rs

@@ -29,22 +29,22 @@ pub struct UserShowPrivateResponse {
 
 #[test]
 fn auth_gives_a_token() {
-    let (_, anon) = TestApp::empty();
+    let (_, anon) = TestApp::simple().empty();
     let json: AuthResponse = anon.get("/authorize_url").good();
     assert!(json.url.contains(&json.state));
 }
 
 #[test]
 fn access_token_needs_data() {
-    let (_, anon) = TestApp::empty();
+    let (_, anon) = TestApp::simple().empty();
     let json = anon.get::<()>("/authorize").bad_with_status(200); // Change endpoint to 400?
     assert!(json.errors[0].detail.contains("invalid state"));
 }
 
 #[test]
 fn me() {
     let url = "/api/v1/me";
-    let (app, anon) = TestApp::empty();
+    let (app, anon) = TestApp::simple().empty();
     anon.get(url).assert_forbidden();
 
     let user = app.db_new_user("foo");
@@ -115,7 +115,7 @@ fn show_latest_user_case_insensitively() {
 
 #[test]
 fn crates_by_user_id() {
-    let (app, _, user) = TestApp::with_user();
+    let (app, _, user) = TestApp::simple().with_user();
     let id = user.as_model().id;
     app.db(|conn| {
         CrateBuilder::new("foo_my_packages", id).expect_build(conn);