Merge pull request #9521 from Turbo87/move-tests

Move tests from `all` test crate into `crates_io`

Author: Turbo87

Cargo.toml

@@ -36,10 +36,6 @@ opt-level = 2
 name = "crates_io"
 doctest = true
 
-[[test]]
-name = "all"
-path = "src/tests/all.rs"
-
 [features]
 default = ["slow-tests"]
 

src/lib.rs

@@ -58,6 +58,8 @@ pub mod storage;
 pub mod tasks;
 pub mod team_repo;
 mod test_util;
+#[cfg(test)]
+mod tests;
 pub mod typosquat;
 pub mod util;
 pub mod views;

src/tests/account_lock.rs

@@ -1,4 +1,4 @@
-use crate::{util::RequestHelper, TestApp};
+use crate::tests::{util::RequestHelper, TestApp};
 use chrono::{DateTime, Duration, NaiveDateTime, Utc};
 use http::StatusCode;
 use insta::assert_snapshot;
@@ -8,7 +8,7 @@ const LOCK_REASON: &str = "test lock reason";
 
 fn lock_account(app: &TestApp, user_id: i32, until: Option<NaiveDateTime>) {
     app.db(|conn| {
-        use crates_io::schema::users;
+        use crate::schema::users;
         use diesel::prelude::*;
 
         diesel::update(users::table)

src/tests/authentication.rs

@@ -1,7 +1,7 @@
-use crate::util::{MockRequestExt, RequestHelper, Response};
-use crate::TestApp;
+use crate::tests::util::{MockRequestExt, RequestHelper, Response};
+use crate::tests::TestApp;
 
-use crate::util::encode_session_header;
+use crate::tests::util::encode_session_header;
 use http::{header, Method, StatusCode};
 use insta::assert_snapshot;
 

src/tests/blocked_routes.rs

@@ -1,5 +1,5 @@
-use crate::builders::{CrateBuilder, VersionBuilder};
-use crate::util::{RequestHelper, TestApp};
+use crate::tests::builders::{CrateBuilder, VersionBuilder};
+use crate::tests::util::{RequestHelper, TestApp};
 use http::StatusCode;
 
 #[tokio::test(flavor = "multi_thread")]

src/tests/builders/dependency.rs

@@ -1,4 +1,4 @@
-use crates_io::views::krate_publish as u;
+use crate::views::krate_publish as u;
 
 /// A builder for constructing a dependency of another crate.
 pub struct DependencyBuilder {

src/tests/builders/krate.rs

@@ -1,12 +1,12 @@
-use crates_io::{
+use crate::{
     models::{Category, Crate, Keyword, NewCrate},
     schema::{crates, version_downloads},
     util::errors::AppResult,
 };
 
+use crate::models::update_default_version;
+use crate::schema::crate_downloads;
 use chrono::NaiveDateTime;
-use crates_io::models::update_default_version;
-use crates_io::schema::crate_downloads;
 use diesel::prelude::*;
 
 use super::VersionBuilder;

src/tests/builders/publish.rs

@@ -1,7 +1,7 @@
+use crate::models::DependencyKind;
+use crate::views::krate_publish as u;
 use bytes::{BufMut, Bytes, BytesMut};
 use cargo_manifest::{DependencyDetail, DepsSet, MaybeInherited};
-use crates_io::models::DependencyKind;
-use crates_io::views::krate_publish as u;
 use std::collections::BTreeMap;
 
 use crates_io_tarball::TarballBuilder;

src/tests/builders/version.rs

@@ -1,12 +1,12 @@
-use crates_io::{
+use crate::{
     models::{Crate, NewVersion, Version},
     schema::{dependencies, versions},
     util::errors::AppResult,
 };
 use std::collections::BTreeMap;
 
+use crate::util::errors::internal;
 use chrono::NaiveDateTime;
-use crates_io::util::errors::internal;
 use diesel::prelude::*;
 
 /// A builder to create version records for the purpose of inserting directly into the database.

src/tests/categories.rs

@@ -1,4 +1,4 @@
-use crates_io::schema::categories;
+use crate::schema::categories;
 use crates_io_test_db::TestDatabase;
 use diesel::*;
 
@@ -50,7 +50,7 @@ fn sync_adds_new_categories() {
     let test_db = TestDatabase::new();
     let mut conn = test_db.connect();
 
-    ::crates_io::boot::categories::sync_with_connection(ALGORITHMS_AND_SUCH, &mut conn).unwrap();
+    crate::boot::categories::sync_with_connection(ALGORITHMS_AND_SUCH, &mut conn).unwrap();
 
     let categories = select_slugs(&mut conn);
     assert_eq!(categories, vec!["algorithms", "algorithms::such"]);
@@ -61,8 +61,8 @@ fn sync_removes_missing_categories() {
     let test_db = TestDatabase::new();
     let mut conn = test_db.connect();
 
-    ::crates_io::boot::categories::sync_with_connection(ALGORITHMS_AND_SUCH, &mut conn).unwrap();
-    ::crates_io::boot::categories::sync_with_connection(ALGORITHMS, &mut conn).unwrap();
+    crate::boot::categories::sync_with_connection(ALGORITHMS_AND_SUCH, &mut conn).unwrap();
+    crate::boot::categories::sync_with_connection(ALGORITHMS, &mut conn).unwrap();
 
     let categories = select_slugs(&mut conn);
     assert_eq!(categories, vec!["algorithms"]);
@@ -73,8 +73,8 @@ fn sync_adds_and_removes() {
     let test_db = TestDatabase::new();
     let mut conn = test_db.connect();
 
-    ::crates_io::boot::categories::sync_with_connection(ALGORITHMS_AND_SUCH, &mut conn).unwrap();
-    ::crates_io::boot::categories::sync_with_connection(ALGORITHMS_AND_ANOTHER, &mut conn).unwrap();
+    crate::boot::categories::sync_with_connection(ALGORITHMS_AND_SUCH, &mut conn).unwrap();
+    crate::boot::categories::sync_with_connection(ALGORITHMS_AND_ANOTHER, &mut conn).unwrap();
 
     let categories = select_slugs(&mut conn);
     assert_eq!(categories, vec!["algorithms", "another"]);
@@ -86,7 +86,7 @@ fn test_real_categories() {
     let mut conn = test_db.connect();
 
     const TOML: &str = include_str!("../boot/categories.toml");
-    assert_ok!(crates_io::boot::categories::sync_with_connection(
+    assert_ok!(crate::boot::categories::sync_with_connection(
         TOML, &mut conn
     ));
 }

src/tests/cors.rs

@@ -1,5 +1,5 @@
-use crate::util::{MockRequestExt, RequestHelper};
-use crate::TestApp;
+use crate::tests::util::{MockRequestExt, RequestHelper};
+use crate::tests::TestApp;
 use http::StatusCode;
 use insta::assert_snapshot;
 

src/tests/dump_db.rs

@@ -1,7 +1,7 @@
-use crate::builders::CrateBuilder;
-use crate::util::TestApp;
+use crate::tests::builders::CrateBuilder;
+use crate::tests::util::TestApp;
+use crate::worker::jobs::{dump_db, DumpDb};
 use bytes::Buf;
-use crates_io::worker::jobs::{dump_db, DumpDb};
 use crates_io_test_db::TestDatabase;
 use crates_io_worker::BackgroundJob;
 use flate2::read::GzDecoder;
@@ -110,7 +110,7 @@ fn tar_paths<R: Read>(archive: &mut Archive<R>) -> Vec<String> {
 
 #[test]
 fn dump_db_and_reimport_dump() {
-    crates_io::util::tracing::init_for_test();
+    crate::util::tracing::init_for_test();
 
     let db_one = TestDatabase::new();
 
@@ -132,7 +132,7 @@ fn dump_db_and_reimport_dump() {
 
 #[test]
 fn test_sql_scripts() {
-    crates_io::util::tracing::init_for_test();
+    crate::util::tracing::init_for_test();
 
     let db = TestDatabase::new();
 

src/tests/github_secret_scanning.rs

@@ -1,7 +1,7 @@
-use crate::util::MockRequestExt;
-use crate::{RequestHelper, TestApp};
-use crates_io::util::token::HashedToken;
-use crates_io::{models::ApiToken, schema::api_tokens};
+use crate::tests::util::MockRequestExt;
+use crate::tests::{RequestHelper, TestApp};
+use crate::util::token::HashedToken;
+use crate::{models::ApiToken, schema::api_tokens};
 use diesel::prelude::*;
 use googletest::prelude::*;
 use http::StatusCode;

src/tests/krate/following.rs

@@ -1,5 +1,5 @@
-use crate::builders::CrateBuilder;
-use crate::util::{RequestHelper, TestApp};
+use crate::tests::builders::CrateBuilder;
+use crate::tests::util::{RequestHelper, TestApp};
 use googletest::prelude::*;
 use http::StatusCode;
 use insta::assert_snapshot;

src/tests/krate/publish/audit_action.rs

@@ -2,9 +2,9 @@ use googletest::prelude::*;
 
 #[tokio::test(flavor = "multi_thread")]
 async fn publish_records_an_audit_action() {
-    use crate::builders::PublishBuilder;
-    use crate::util::{RequestHelper, TestApp};
-    use crates_io::models::VersionOwnerAction;
+    use crate::models::VersionOwnerAction;
+    use crate::tests::builders::PublishBuilder;
+    use crate::tests::util::{RequestHelper, TestApp};
 
     let (app, anon, _, token) = TestApp::full().with_token();
 

src/tests/krate/publish/auth.rs

@@ -1,6 +1,6 @@
-use crate::builders::{CrateBuilder, PublishBuilder};
-use crate::util::{RequestHelper, TestApp};
-use crates_io::schema::api_tokens;
+use crate::schema::api_tokens;
+use crate::tests::builders::{CrateBuilder, PublishBuilder};
+use crate::tests::util::{RequestHelper, TestApp};
 use diesel::{ExpressionMethods, RunQueryDsl};
 use googletest::prelude::*;
 use http::StatusCode;

src/tests/krate/publish/basics.rs

@@ -1,6 +1,6 @@
-use crate::builders::{CrateBuilder, PublishBuilder};
-use crate::util::{RequestHelper, TestApp};
-use crates_io::schema::versions_published_by;
+use crate::schema::versions_published_by;
+use crate::tests::builders::{CrateBuilder, PublishBuilder};
+use crate::tests::util::{RequestHelper, TestApp};
 use diesel::{QueryDsl, RunQueryDsl};
 use googletest::prelude::*;
 use http::StatusCode;

src/tests/krate/publish/build_metadata.rs

@@ -1,5 +1,5 @@
-use crate::builders::PublishBuilder;
-use crate::util::{RequestHelper, TestApp};
+use crate::tests::builders::PublishBuilder;
+use crate::tests::util::{RequestHelper, TestApp};
 use http::StatusCode;
 use insta::assert_json_snapshot;
 

src/tests/krate/publish/categories.rs

@@ -1,6 +1,6 @@
-use crate::builders::PublishBuilder;
-use crate::new_category;
-use crate::util::{RequestHelper, TestApp};
+use crate::tests::builders::PublishBuilder;
+use crate::tests::new_category;
+use crate::tests::util::{RequestHelper, TestApp};
 use googletest::prelude::*;
 use http::StatusCode;
 use insta::{assert_json_snapshot, assert_snapshot};

src/tests/krate/publish/dependencies.rs

@@ -1,5 +1,5 @@
-use crate::builders::{CrateBuilder, DependencyBuilder, PublishBuilder};
-use crate::util::{RequestHelper, TestApp};
+use crate::tests::builders::{CrateBuilder, DependencyBuilder, PublishBuilder};
+use crate::tests::util::{RequestHelper, TestApp};
 use googletest::prelude::*;
 use http::StatusCode;
 use insta::{assert_json_snapshot, assert_snapshot};
@@ -153,7 +153,7 @@ async fn new_with_underscore_renamed_dependency() {
 
 #[tokio::test(flavor = "multi_thread")]
 async fn new_krate_with_dependency() {
-    use crate::routes::crates::versions::dependencies::Deps;
+    use crate::tests::routes::crates::versions::dependencies::Deps;
 
     let (app, anon, user, token) = TestApp::full().with_token();
 

src/tests/krate/publish/emails.rs

@@ -1,6 +1,6 @@
-use crate::builders::PublishBuilder;
-use crate::util::{RequestHelper, TestApp};
-use crates_io::schema::emails;
+use crate::schema::emails;
+use crate::tests::builders::PublishBuilder;
+use crate::tests::util::{RequestHelper, TestApp};
 use diesel::{delete, update, ExpressionMethods, RunQueryDsl};
 use googletest::prelude::*;
 use http::StatusCode;

src/tests/krate/publish/features.rs

@@ -1,5 +1,5 @@
-use crate::builders::{CrateBuilder, DependencyBuilder, PublishBuilder};
-use crate::util::{RequestHelper, TestApp};
+use crate::tests::builders::{CrateBuilder, DependencyBuilder, PublishBuilder};
+use crate::tests::util::{RequestHelper, TestApp};
 use googletest::prelude::*;
 use http::StatusCode;
 use insta::{assert_json_snapshot, assert_snapshot};

src/tests/krate/publish/git.rs

@@ -1,5 +1,5 @@
-use crate::builders::PublishBuilder;
-use crate::util::{RequestHelper, TestApp};
+use crate::tests::builders::PublishBuilder;
+use crate::tests::util::{RequestHelper, TestApp};
 use insta::assert_snapshot;
 
 #[tokio::test(flavor = "multi_thread")]

src/tests/krate/publish/inheritance.rs

@@ -1,5 +1,5 @@
-use crate::builders::PublishBuilder;
-use crate::util::{RequestHelper, TestApp};
+use crate::tests::builders::PublishBuilder;
+use crate::tests::util::{RequestHelper, TestApp};
 use http::StatusCode;
 use insta::assert_snapshot;
 

src/tests/krate/publish/keywords.rs

@@ -1,5 +1,5 @@
-use crate::builders::PublishBuilder;
-use crate::util::{RequestHelper, TestApp};
+use crate::tests::builders::PublishBuilder;
+use crate::tests::util::{RequestHelper, TestApp};
 use googletest::prelude::*;
 use http::StatusCode;
 use insta::{assert_json_snapshot, assert_snapshot};

src/tests/krate/publish/links.rs

@@ -1,6 +1,6 @@
-use crate::builders::PublishBuilder;
-use crate::util::insta::{self, assert_json_snapshot};
-use crate::util::{RequestHelper, TestApp};
+use crate::tests::builders::PublishBuilder;
+use crate::tests::util::insta::{self, assert_json_snapshot};
+use crate::tests::util::{RequestHelper, TestApp};
 use http::StatusCode;
 
 #[tokio::test(flavor = "multi_thread")]

src/tests/krate/publish/manifest.rs

@@ -1,6 +1,6 @@
-use crate::builders::PublishBuilder;
-use crate::util::insta::{any_id_redaction, id_redaction};
-use crate::util::{RequestHelper, TestApp};
+use crate::tests::builders::PublishBuilder;
+use crate::tests::util::insta::{any_id_redaction, id_redaction};
+use crate::tests::util::{RequestHelper, TestApp};
 use http::StatusCode;
 use insta::{assert_json_snapshot, assert_snapshot};
 

src/tests/krate/publish/max_size.rs

@@ -1,5 +1,5 @@
-use crate::builders::{CrateBuilder, PublishBuilder};
-use crate::util::{RequestHelper, TestApp};
+use crate::tests::builders::{CrateBuilder, PublishBuilder};
+use crate::tests::util::{RequestHelper, TestApp};
 use crates_io_tarball::TarballBuilder;
 use flate2::Compression;
 use googletest::prelude::*;

src/tests/krate/publish/rate_limit.rs

@@ -1,8 +1,8 @@
-use crate::builders::PublishBuilder;
-use crate::util::{RequestHelper, TestApp};
+use crate::rate_limiter::LimitedAction;
+use crate::schema::{publish_limit_buckets, publish_rate_overrides};
+use crate::tests::builders::PublishBuilder;
+use crate::tests::util::{RequestHelper, TestApp};
 use chrono::{NaiveDateTime, Utc};
-use crates_io::rate_limiter::LimitedAction;
-use crates_io::schema::{publish_limit_buckets, publish_rate_overrides};
 use diesel::{ExpressionMethods, RunQueryDsl};
 use http::StatusCode;
 use insta::assert_snapshot;

src/tests/krate/publish/readme.rs

@@ -1,5 +1,5 @@
-use crate::builders::{CrateBuilder, PublishBuilder};
-use crate::util::{RequestHelper, TestApp};
+use crate::tests::builders::{CrateBuilder, PublishBuilder};
+use crate::tests::util::{RequestHelper, TestApp};
 use http::StatusCode;
 use insta::{assert_json_snapshot, assert_snapshot};
 

src/tests/krate/publish/similar_names.rs

@@ -1,5 +1,5 @@
-use crate::builders::{CrateBuilder, PublishBuilder};
-use crate::util::{RequestHelper, TestApp};
+use crate::tests::builders::{CrateBuilder, PublishBuilder};
+use crate::tests::util::{RequestHelper, TestApp};
 use googletest::prelude::*;
 use http::StatusCode;
 use insta::assert_snapshot;

src/tests/krate/publish/snapshots/all__krate__publish__basics__new_krate-2.snap renamed to src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate-2.snap

@@ -1,5 +1,5 @@
-use crate::builders::PublishBuilder;
-use crate::util::{RequestHelper, TestApp};
+use crate::tests::builders::PublishBuilder;
+use crate::tests::util::{RequestHelper, TestApp};
 use crates_io_tarball::TarballBuilder;
 use googletest::prelude::*;
 use http::StatusCode;

src/tests/krate/publish/snapshots/all__krate__publish__basics__new_krate-4.snap renamed to src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate-4.snap

@@ -1,9 +1,9 @@
 #[tokio::test(flavor = "multi_thread")]
 async fn uploading_new_version_touches_crate() {
-    use crate::builders::PublishBuilder;
-    use crate::util::{RequestHelper, TestApp};
-    use crate::CrateResponse;
-    use crates_io::schema::crates;
+    use crate::schema::crates;
+    use crate::tests::builders::PublishBuilder;
+    use crate::tests::util::{RequestHelper, TestApp};
+    use crate::tests::CrateResponse;
     use diesel::dsl::*;
     use diesel::{ExpressionMethods, RunQueryDsl};