diff --git a/src/build_queue.rs b/src/build_queue.rs index 13cf21b95..4f94db520 100644 --- a/src/build_queue.rs +++ b/src/build_queue.rs @@ -752,13 +752,13 @@ mod tests { config.rebuild_up_to_date = Some(NaiveDate::from_ymd_opt(2020, 1, 1).unwrap()); }); - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") .builds(vec![FakeBuild::default() .rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)")]) - .create_async() + .create() .await?; let build_queue = env.async_build_queue().await; @@ -781,13 +781,13 @@ mod tests { config.rebuild_up_to_date = Some(NaiveDate::from_ymd_opt(2024, 1, 1).unwrap()); }); - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") .builds(vec![FakeBuild::default() .rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)")]) - .create_async() + .create() .await?; let build_queue = env.async_build_queue().await; @@ -829,13 +829,13 @@ mod tests { assert_eq!(build_queue.queued_crates().await?.len(), 0); - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") .builds(vec![FakeBuild::default() .rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)")]) - .create_async() + .create() .await?; let build_queue = env.async_build_queue().await; @@ -863,13 +863,13 @@ mod tests { .add_crate("foo2", "0.1.0", REBUILD_PRIORITY, None) .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") .builds(vec![FakeBuild::default() .rustc_version("rustc 1.84.0-nightly (e7c0d2750 2020-10-15)")]) - .create_async() + .create() .await?; let build_queue = env.async_build_queue().await; diff --git a/src/db/add_package.rs b/src/db/add_package.rs index d648442d6..0080b15c9 100644 --- a/src/db/add_package.rs +++ b/src/db/add_package.rs @@ -825,12 +825,12 @@ mod test { let mut conn = env.async_db().await.async_conn().await; let release_id = env - .async_fake_release() + .fake_release() .await .name("dummy") .version("0.13.0") .keywords(vec!["kw 1".into(), "kw 2".into()]) - .create_async() + .create() .await?; let kw_r = sqlx::query!( @@ -867,19 +867,23 @@ mod test { #[test] fn keyword_conflict_when_rebuilding_release() { - wrapper(|env| { + async_wrapper(|env| async move { env.fake_release() + .await .name("dummy") .version("0.13.0") .keywords(vec!["kw 3".into(), "kw 4".into()]) - .create()?; + .create() + .await?; // same version so we have the same release env.fake_release() + .await .name("dummy") .version("0.13.0") .keywords(vec!["kw 3".into(), "kw 4".into()]) - .create()?; + .create() + .await?; Ok(()) }) @@ -888,21 +892,21 @@ mod test { #[test] fn updated_keywords() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.13.0") .keywords(vec!["kw 3".into(), "kw 4".into()]) - .create_async() + .create() .await?; let release_id = env - .async_fake_release() + .fake_release() .await .name("dummy") .version("0.13.0") .keywords(vec!["kw 1".into(), "kw 2".into()]) - .create_async() + .create() .await?; let mut conn = env.async_db().await.async_conn().await; diff --git a/src/db/delete.rs b/src/db/delete.rs index fc741fc55..33ccf3fb7 100644 --- a/src/db/delete.rs +++ b/src/db/delete.rs @@ -242,11 +242,11 @@ mod tests { #[test] fn test_get_id_uses_normalization() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("Some_Package") .version("1.0.0") - .create_async() + .create() .await?; let mut conn = env.async_db().await.async_conn().await; @@ -264,27 +264,27 @@ mod tests { // Create fake packages in the database let pkg1_v1_id = env - .async_fake_release() + .fake_release() .await .name("package-1") .version("1.0.0") .archive_storage(archive_storage) - .create_async() + .create() .await?; let pkg1_v2_id = env - .async_fake_release() + .fake_release() .await .name("package-1") .version("2.0.0") .archive_storage(archive_storage) - .create_async() + .create() .await?; let pkg2_id = env - .async_fake_release() + .fake_release() .await .name("package-2") .archive_storage(archive_storage) - .create_async() + .create() .await?; assert!(crate_exists(&mut conn, "package-1").await?); @@ -407,7 +407,7 @@ mod tests { let mut conn = env.async_db().await.async_conn().await; let v1 = env - .async_fake_release() + .fake_release() .await .name("a") .version("1.0.0") @@ -417,7 +417,7 @@ mod tests { avatar: "https://example.org/malicious".into(), kind: OwnerKind::User, }) - .create_async() + .create() .await?; assert!(release_exists(&mut conn, v1).await?); assert!( @@ -438,7 +438,7 @@ mod tests { ); let v2 = env - .async_fake_release() + .fake_release() .await .name("a") .version("2.0.0") @@ -448,7 +448,7 @@ mod tests { avatar: "https://example.org/peter".into(), kind: OwnerKind::User, }) - .create_async() + .create() .await?; assert!(release_exists(&mut conn, v2).await?); assert!( diff --git a/src/test/fakes.rs b/src/test/fakes.rs index 51eb23eea..0cca3288d 100644 --- a/src/test/fakes.rs +++ b/src/test/fakes.rs @@ -18,7 +18,6 @@ use chrono::{DateTime, Utc}; use std::collections::HashMap; use std::iter; use std::sync::Arc; -use tokio::runtime::Runtime; use tracing::debug; /// Create a fake release in the database that failed before the build. @@ -55,7 +54,6 @@ pub(crate) async fn fake_release_that_failed_before_build( pub(crate) struct FakeRelease<'a> { db: &'a TestDatabase, storage: Arc, - runtime: Arc, package: MetadataPackage, builds: Option>, /// name, content @@ -92,12 +90,10 @@ impl<'a> FakeRelease<'a> { pub(super) fn new( db: &'a TestDatabase, storage: Arc, - runtime: Arc, ) -> Self { FakeRelease { db, storage, - runtime, package: MetadataPackage { id: "fake-package-id".into(), name: "fake-package".into(), @@ -328,13 +324,8 @@ impl<'a> FakeRelease<'a> { self } - pub(crate) fn create(self) -> Result { - let runtime = self.runtime.clone(); - runtime.block_on(self.create_async()) - } - /// Returns the release_id - pub(crate) async fn create_async(self) -> Result { + pub(crate) async fn create(self) -> Result { use std::fs; use std::path::Path; diff --git a/src/test/mod.rs b/src/test/mod.rs index 5b8939e5b..1e411f3e6 100644 --- a/src/test/mod.rs +++ b/src/test/mod.rs @@ -601,10 +601,6 @@ impl TestEnvironment { .await } - pub(crate) fn fake_release(&self) -> fakes::FakeRelease { - self.runtime().block_on(self.async_fake_release()) - } - pub(crate) async fn web_app(&self) -> Router { let template_data = Arc::new(TemplateData::new(1).unwrap()); build_axum_app(self, template_data) @@ -612,12 +608,8 @@ impl TestEnvironment { .expect("could not build axum app") } - pub(crate) async fn async_fake_release(&self) -> fakes::FakeRelease { - fakes::FakeRelease::new( - self.async_db().await, - self.async_storage().await, - self.runtime(), - ) + pub(crate) async fn fake_release(&self) -> fakes::FakeRelease { + fakes::FakeRelease::new(self.async_db().await, self.async_storage().await) } } diff --git a/src/utils/consistency/db.rs b/src/utils/consistency/db.rs index 3b58070a3..673561a08 100644 --- a/src/utils/consistency/db.rs +++ b/src/utils/consistency/db.rs @@ -71,18 +71,18 @@ mod tests { .await .add_crate("queued", "0.0.1", 0, None) .await?; - env.async_fake_release() + env.fake_release() .await .name("krate") .version("0.0.2") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("krate") .version("0.0.3") .yanked(true) - .create_async() + .create() .await?; let mut conn = env.async_db().await.async_conn().await; diff --git a/src/utils/consistency/mod.rs b/src/utils/consistency/mod.rs index 49452d83e..663880005 100644 --- a/src/utils/consistency/mod.rs +++ b/src/utils/consistency/mod.rs @@ -185,12 +185,12 @@ mod tests { #[test] fn test_delete_crate() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("krate") .version("0.1.1") .version("0.1.2") - .create_async() + .create() .await?; let diff = [Difference::CrateNotInIndex("krate".into())]; @@ -218,17 +218,17 @@ mod tests { #[test] fn test_delete_release() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("krate") .version("0.1.1") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("krate") .version("0.1.2") - .create_async() + .create() .await?; let diff = [Difference::ReleaseNotInIndex( @@ -256,12 +256,12 @@ mod tests { #[test] fn test_wrong_yank() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("krate") .version("0.1.1") .yanked(true) - .create_async() + .create() .await?; let diff = [Difference::ReleaseYank( diff --git a/src/utils/html.rs b/src/utils/html.rs index 548c7310f..0cf9931bb 100644 --- a/src/utils/html.rs +++ b/src/utils/html.rs @@ -112,7 +112,7 @@ mod test { #[test] fn rewriting_only_injects_css_once() { async_wrapper(|env| async move { - env.async_fake_release().await + env.fake_release().await .name("testing") .version("0.1.0") // A somewhat representative rustdoc html file from 2016 @@ -139,7 +139,7 @@ mod test { "#) - .create_async().await?; + .create().await?; let web = env.web_app().await; let output = web.get("/testing/0.1.0/2016/").await?.text().await?; diff --git a/src/web/build_details.rs b/src/web/build_details.rs index e277fe785..d683b0301 100644 --- a/src/web/build_details.rs +++ b/src/web/build_details.rs @@ -254,14 +254,14 @@ mod tests { #[test] fn db_build_logs() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") .builds(vec![FakeBuild::default() .no_s3_build_log() .db_build_log("A build log")]) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -294,12 +294,12 @@ mod tests { #[test] fn s3_build_logs() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") .builds(vec![FakeBuild::default().s3_build_log("A build log")]) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -346,7 +346,7 @@ mod tests { #[test] fn s3_build_logs_multiple_targets() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") @@ -356,7 +356,7 @@ mod tests { "other_target", "other target build log", )]) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -413,14 +413,14 @@ mod tests { #[test] fn both_build_logs() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") .builds(vec![FakeBuild::default() .s3_build_log("A build log") .db_build_log("Another build log")]) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -449,11 +449,11 @@ mod tests { #[test_case("nan")] fn non_existing_build(build_id: &str) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") - .create_async() + .create() .await?; let res = env diff --git a/src/web/builds.rs b/src/web/builds.rs index 01542c3b6..1a8bcd19a 100644 --- a/src/web/builds.rs +++ b/src/web/builds.rs @@ -299,7 +299,7 @@ mod tests { #[test] fn build_list() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") @@ -319,7 +319,7 @@ mod tests { .rustc_version("rustc (blabla 2022-01-01)") .docsrs_version("docs.rs 4.0.0"), ]) - .create_async() + .create() .await?; let response = env.web_app().await.get("/crate/foo/0.1.0/builds").await?; @@ -346,7 +346,7 @@ mod tests { #[test] fn build_list_json() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") @@ -366,7 +366,7 @@ mod tests { .rustc_version("rustc (blabla 2022-01-01)") .docsrs_version("docs.rs 4.0.0"), ]) - .create_async() + .create() .await?; let response = env @@ -441,11 +441,11 @@ mod tests { fn build_trigger_rebuild_missing_config() { async_wrapper(|env| async move { env.override_config(|config| config.cratesio_token = None); - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") - .create_async() + .create() .await?; { @@ -485,11 +485,11 @@ mod tests { let correct_token = "foo137"; env.override_config(|config| config.cratesio_token = Some(correct_token.into())); - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") - .create_async() + .create() .await?; { @@ -590,12 +590,12 @@ mod tests { #[test] fn build_empty_list() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") .no_builds() - .create_async() + .create() .await?; let response = env.web_app().await.get("/crate/foo/0.1.0/builds").await?; @@ -627,11 +627,11 @@ mod tests { #[test] fn limits() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") - .create_async() + .create() .await?; let mut conn = env.async_db().await.async_conn().await; @@ -675,24 +675,24 @@ mod tests { #[test] fn latest_200() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("aquarelle") .version("0.1.0") .builds(vec![FakeBuild::default() .rustc_version("rustc (blabla 2019-01-01)") .docsrs_version("docs.rs 1.0.0")]) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("aquarelle") .version("0.2.0") .builds(vec![FakeBuild::default() .rustc_version("rustc (blabla 2019-01-01)") .docsrs_version("docs.rs 1.0.0")]) - .create_async() + .create() .await?; let resp = env @@ -718,14 +718,14 @@ mod tests { #[test] fn crate_version_not_found() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") .builds(vec![FakeBuild::default() .rustc_version("rustc (blabla 2019-01-01)") .docsrs_version("docs.rs 1.0.0")]) - .create_async() + .create() .await?; let resp = env.web_app().await.get("/crate/foo/0.2.0/builds").await?; @@ -737,14 +737,14 @@ mod tests { #[test] fn invalid_semver() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") .builds(vec![FakeBuild::default() .rustc_version("rustc (blabla 2019-01-01)") .docsrs_version("docs.rs 1.0.0")]) - .create_async() + .create() .await?; let resp = env.web_app().await.get("/crate/foo/0,1,0/builds").await?; diff --git a/src/web/crate_details.rs b/src/web/crate_details.rs index fd9aef14a..e47c5e929 100644 --- a/src/web/crate_details.rs +++ b/src/web/crate_details.rs @@ -915,26 +915,26 @@ mod tests { let db = env.async_db().await; let mut conn = db.async_conn().await; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") .documentation_url(Some("https://foo.com".into())) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.2.0") .documentation_url(Some("https://docs.rs/foo/".into())) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.3.0") .documentation_url(None) - .create_async() + .create() .await?; let details_0_1 = crate_details(&mut conn, "foo", "0.1.0", None).await; @@ -957,39 +957,39 @@ mod tests { async_wrapper(|env| async move { let db = env.async_db().await; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.1") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.2") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.3") .build_result_failed() - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.4") .yanked(true) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.5") .build_result_failed() .yanked(true) - .create_async() + .create() .await?; assert_last_successful_build_equals(db, "foo", "0.0.1", None).await?; @@ -1006,26 +1006,26 @@ mod tests { async_wrapper(|env| async move { let db = env.async_db().await; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.1") .build_result_failed() - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.2") .build_result_failed() - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.3") .yanked(true) - .create_async() + .create() .await?; assert_last_successful_build_equals(db, "foo", "0.0.1", None).await?; @@ -1040,31 +1040,31 @@ mod tests { async_wrapper(|env| async move { let db = env.async_db().await; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.1") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.2") .build_result_failed() - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.3") .yanked(true) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.4") - .create_async() + .create() .await?; assert_last_successful_build_equals(db, "foo", "0.0.1", None).await?; @@ -1081,57 +1081,57 @@ mod tests { let db = env.async_db().await; // Add new releases of 'foo' out-of-order since CrateDetails should sort them descending - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.1") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.3.0") .build_result_failed() - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("1.0.0") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.12.0") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.2.0") .yanked(true) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.2.0-alpha") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.1") .build_result_failed() .binary(true) - .create_async() + .create() .await?; let mut conn = db.async_conn().await; @@ -1222,17 +1222,17 @@ mod tests { #[test] fn test_canonical_url() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.1") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.2") - .create_async() + .create() .await?; let response = env.web_app().await.get("/crate/foo/0.0.1").await?; @@ -1253,23 +1253,23 @@ mod tests { async_wrapper(|env| async move { let db = env.async_db().await; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.1") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.3") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.2") - .create_async() + .create() .await?; let mut conn = db.async_conn().await; @@ -1290,23 +1290,23 @@ mod tests { async_wrapper(|env| async move { let db = env.async_db().await; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.1") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.3-pre.1") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.2") - .create_async() + .create() .await?; let mut conn = db.async_conn().await; @@ -1327,24 +1327,24 @@ mod tests { async_wrapper(|env| async move { let db = env.async_db().await; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.1") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.3") .yanked(true) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.2") - .create_async() + .create() .await?; let mut conn = db.async_conn().await; @@ -1365,26 +1365,26 @@ mod tests { async_wrapper(|env| async move { let db = env.async_db().await; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.1") .yanked(true) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.3") .yanked(true) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.2") .yanked(true) - .create_async() + .create() .await?; let mut conn = db.async_conn().await; @@ -1405,20 +1405,20 @@ mod tests { async_wrapper(|env| async move { let db = env.async_db().await; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.1") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.2") .builds(vec![ FakeBuild::default().build_status(BuildStatus::InProgress) ]) - .create_async() + .create() .await?; let mut conn = db.async_conn().await; @@ -1437,12 +1437,12 @@ mod tests { #[test] fn releases_dropdowns_show_binary_warning() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("binary") .version("0.1.0") .binary(true) - .create_async() + .create() .await?; let page = kuchikiki::parse_html().one( @@ -1475,14 +1475,14 @@ mod tests { #[test] fn releases_dropdowns_show_in_progress() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") .builds(vec![ FakeBuild::default().build_status(BuildStatus::InProgress) ]) - .create_async() + .create() .await?; let response = env.web_app().await.get("/crate/foo/latest").await?; @@ -1512,7 +1512,7 @@ mod tests { async_wrapper(|env| async move { let db = env.async_db().await; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.1") @@ -1521,7 +1521,7 @@ mod tests { avatar: "https://example.org/foobar".into(), kind: OwnerKind::User, }) - .create_async() + .create() .await?; let mut conn = db.async_conn().await; @@ -1536,7 +1536,7 @@ mod tests { ); // Adding a new owner, and changing details on an existing owner - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.2") @@ -1550,7 +1550,7 @@ mod tests { avatar: "https://example.org/barfoo".into(), kind: OwnerKind::User, }) - .create_async() + .create() .await?; let details = crate_details(&mut conn, "foo", "0.0.1", None).await; @@ -1573,7 +1573,7 @@ mod tests { ); // Removing an existing owner - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.3") @@ -1582,7 +1582,7 @@ mod tests { avatar: "https://example.org/barfoo".into(), kind: OwnerKind::User, }) - .create_async() + .create() .await?; let mut conn = db.async_conn().await; @@ -1597,7 +1597,7 @@ mod tests { ); // Changing owner details on another of their crates applies the change to both - env.async_fake_release() + env.fake_release() .await .name("bar") .version("0.0.1") @@ -1606,7 +1606,7 @@ mod tests { avatar: "https://example.org/barfoov2".into(), kind: OwnerKind::User, }) - .create_async() + .create() .await?; let mut conn = db.async_conn().await; @@ -1627,12 +1627,12 @@ mod tests { #[test] fn feature_flags_report_empty() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("library") .version("0.1.0") .features(HashMap::new()) - .create_async() + .create() .await?; let page = kuchikiki::parse_html().one( @@ -1655,12 +1655,12 @@ mod tests { .iter() .cloned() .collect::>>(); - env.async_fake_release() + env.fake_release() .await .name("library") .version("0.1.0") .features(features) - .create_async() + .create() .await?; let page = kuchikiki::parse_html().one( @@ -1683,12 +1683,12 @@ mod tests { .iter() .cloned() .collect::>>(); - env.async_fake_release() + env.fake_release() .await .name("library") .version("0.1.0") .features(features) - .create_async() + .create() .await?; let page = kuchikiki::parse_html().one( @@ -1719,12 +1719,12 @@ mod tests { .iter() .cloned() .collect::>>(); - env.async_fake_release() + env.fake_release() .await .name("library") .version("0.1.0") .features(features) - .create_async() + .create() .await?; let page = kuchikiki::parse_html().one( @@ -1747,13 +1747,13 @@ mod tests { #[test] fn details_with_repository_and_stats_can_render_icon() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("library") .version("0.1.0") .repo("https://github.com/org/repo") .github_stats("org/repo", 10, 10, 10) - .create_async() + .create() .await?; let page = kuchikiki::parse_html().one( @@ -1789,11 +1789,11 @@ mod tests { fn feature_flags_report_null() { async_wrapper(|env| async move { let id = env - .async_fake_release() + .fake_release() .await .name("library") .version("0.1.0") - .create_async() + .create() .await?; let mut conn = env.async_db().await.async_conn().await; @@ -1934,7 +1934,7 @@ mod tests { } async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.4.0") @@ -1944,7 +1944,7 @@ mod tests { .default_target("x86_64-unknown-linux-gnu") .add_target("x86_64-pc-windows-msvc") .source_file("README.md", b"storage readme") - .create_async() + .create() .await?; run_check_links_redir(&env, "/crate/dummy/0.4.0/features", false).await; @@ -1992,23 +1992,23 @@ mod tests { } async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy-ba") .version("0.4.0") .rustdoc_file("dummy-ba/index.html") .rustdoc_file("x86_64-unknown-linux-gnu/dummy-ba/index.html") .add_target("x86_64-unknown-linux-gnu") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("dummy-ba") .version("0.5.0") .rustdoc_file("dummy-ba/index.html") .rustdoc_file("x86_64-unknown-linux-gnu/dummy-ba/index.html") .add_target("x86_64-unknown-linux-gnu") - .create_async() + .create() .await?; check_links( @@ -2044,7 +2044,7 @@ mod tests { fn check_count(nb_targets: usize, expected: usize) { async_wrapper(|env| async move { let mut rel = env - .async_fake_release() + .fake_release() .await .name("dummy") .version("0.4.0") @@ -2055,7 +2055,7 @@ mod tests { for nb in 0..nb_targets - 1 { rel = rel.add_target(&format!("x86_64-pc-windows-msvc{nb}")); } - rel.create_async().await?; + rel.create().await?; let response = env.web_app().await.get("/crate/dummy/0.4.0").await?; assert!(response.status().is_success()); @@ -2080,7 +2080,7 @@ mod tests { #[test] fn latest_url() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.4.0") @@ -2088,7 +2088,7 @@ mod tests { .rustdoc_file("x86_64-pc-windows-msvc/dummy/index.html") .default_target("x86_64-unknown-linux-gnu") .add_target("x86_64-pc-windows-msvc") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -2118,49 +2118,49 @@ mod tests { #[test] fn readme() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .readme_only_database("database readme") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.2.0") .readme_only_database("database readme") .source_file("README.md", b"storage readme") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.3.0") .source_file("README.md", b"storage readme") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.4.0") .readme_only_database("database readme") .source_file("MEREAD", b"storage meread") .source_file("Cargo.toml", br#"package.readme = "MEREAD""#) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.5.0") .readme_only_database("database readme") .source_file("README.md", b"storage readme") .no_cargo_toml() - .create_async() + .create() .await?; let check_readme = |path: String, content: String| { @@ -2190,11 +2190,11 @@ mod tests { #[test] fn test_crate_name_with_other_uri_chars() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("1.0.0") - .create_async() + .create() .await?; assert_eq!( @@ -2210,11 +2210,11 @@ mod tests { fn test_build_status_no_builds() { async_wrapper(|env| async move { let release_id = env - .async_fake_release() + .fake_release() .await .name("dummy") .version("0.1.0") - .create_async() + .create() .await?; let mut conn = env.async_db().await.async_conn().await; @@ -2236,7 +2236,7 @@ mod tests { #[test] fn test_build_status_successful() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") @@ -2245,7 +2245,7 @@ mod tests { FakeBuild::default().build_status(BuildStatus::Failure), FakeBuild::default().build_status(BuildStatus::InProgress), ]) - .create_async() + .create() .await?; let mut conn = env.async_db().await.async_conn().await; @@ -2262,7 +2262,7 @@ mod tests { #[test] fn test_build_status_failed() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") @@ -2270,7 +2270,7 @@ mod tests { FakeBuild::default().build_status(BuildStatus::Failure), FakeBuild::default().build_status(BuildStatus::InProgress), ]) - .create_async() + .create() .await?; let mut conn = env.async_db().await.async_conn().await; @@ -2287,14 +2287,14 @@ mod tests { #[test] fn test_build_status_in_progress() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .builds(vec![ FakeBuild::default().build_status(BuildStatus::InProgress) ]) - .create_async() + .create() .await?; let mut conn = env.async_db().await.async_conn().await; @@ -2311,12 +2311,12 @@ mod tests { #[test] fn test_sizes_display() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.4.0") .rustdoc_file("dummy/index.html") - .create_async() + .create() .await?; let web = env.web_app().await; diff --git a/src/web/error.rs b/src/web/error.rs index 3ef2c8991..0f68062cb 100644 --- a/src/web/error.rs +++ b/src/web/error.rs @@ -284,10 +284,10 @@ mod tests { #[test] fn check_400_page_content_not_semver_version() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") - .create_async() + .create() .await?; let response = env.web_app().await.get("/dummy/not-semver").await?; @@ -311,11 +311,11 @@ mod tests { #[test] fn check_404_page_content_nonexistent_version() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("1.0.0") - .create_async() + .create() .await?; let page = kuchikiki::parse_html() .one(env.web_app().await.get("/dummy/2.0").await?.text().await?); @@ -336,12 +336,12 @@ mod tests { #[test] fn check_404_page_content_any_version_all_yanked() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("1.0.0") .yanked(true) - .create_async() + .create() .await?; let page = kuchikiki::parse_html() .one(env.web_app().await.get("/dummy/*").await?.text().await?); diff --git a/src/web/features.rs b/src/web/features.rs index acbededa2..2f158a5e9 100644 --- a/src/web/features.rs +++ b/src/web/features.rs @@ -358,12 +358,12 @@ mod tests { #[test] fn semver_redirect() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.2.1") .features(HashMap::new()) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -381,12 +381,12 @@ mod tests { #[test] fn specific_version_correctly_cached() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.2.0") .features(HashMap::new()) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -400,20 +400,20 @@ mod tests { #[test] fn latest_200() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") .features(HashMap::new()) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.2.0") .features(HashMap::new()) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -431,12 +431,12 @@ mod tests { #[test] fn crate_version_not_found() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") .features(HashMap::new()) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -449,12 +449,12 @@ mod tests { #[test] fn invalid_semver() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") .features(HashMap::new()) - .create_async() + .create() .await?; let web = env.web_app().await; diff --git a/src/web/file.rs b/src/web/file.rs index 1327a9694..64157e17a 100644 --- a/src/web/file.rs +++ b/src/web/file.rs @@ -66,7 +66,7 @@ mod tests { async_wrapper(|env| async move { let now = Utc::now(); - env.async_fake_release().await.create_async().await?; + env.fake_release().await.create().await?; let mut file = File::from_path( &*env.async_storage().await, @@ -104,7 +104,7 @@ mod tests { config.max_file_size_html = MAX_HTML_SIZE; }); - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") @@ -114,7 +114,7 @@ mod tests { .rustdoc_file_with("small.js", &[b'A'; MAX_SIZE / 2] as &[u8]) .rustdoc_file_with("exact.js", &[b'A'; MAX_SIZE] as &[u8]) .rustdoc_file_with("big.js", &[b'A'; MAX_SIZE * 2] as &[u8]) - .create_async() + .create() .await?; let file = |path| { diff --git a/src/web/metrics.rs b/src/web/metrics.rs index 47788b272..b73b9634a 100644 --- a/src/web/metrics.rs +++ b/src/web/metrics.rs @@ -155,25 +155,25 @@ mod tests { ]; async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("rcc") .version("0.0.0") .repo("https://github.com/jyn514/rcc") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("rcc") .version("1.0.0") .build_result_failed() - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("hexponent") .version("0.2.0") - .create_async() + .create() .await?; let frontend = env.web_app().await; diff --git a/src/web/mod.rs b/src/web/mod.rs index 702513939..f510bbd7e 100644 --- a/src/web/mod.rs +++ b/src/web/mod.rs @@ -778,11 +778,11 @@ mod test { use test_case::test_case; async fn release(version: &str, env: &TestEnvironment) -> ReleaseId { - env.async_fake_release() + env.fake_release() .await .name("foo") .version(version) - .create_async() + .create() .await .unwrap() } @@ -830,7 +830,7 @@ mod test { #[test] fn test_doc_coverage_for_crate_pages() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.0.1") @@ -841,7 +841,7 @@ mod test { total_items_needing_examples: 2, items_with_examples: 1, }) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -870,12 +870,12 @@ mod test { #[test] fn test_show_clipboard_for_crate_pages() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("fake_crate") .version("0.0.1") .source_file("test.rs", &[]) - .create_async() + .create() .await?; let web = env.web_app().await; assert!(clipboard_is_present_for_path("/crate/fake_crate/0.0.1", &web).await); @@ -888,11 +888,11 @@ mod test { #[test] fn test_hide_clipboard_for_non_crate_pages() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("fake_crate") .version("0.0.1") - .create_async() + .create() .await?; let web = env.web_app().await; assert!(!clipboard_is_present_for_path("/about", &web).await); @@ -963,11 +963,11 @@ mod test { #[test] fn double_slash_does_redirect_to_latest_version() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("bat") .version("0.2.0") - .create_async() + .create() .await?; let web = env.web_app().await; web.assert_redirect("/bat//", "/bat/latest/bat/").await?; @@ -978,12 +978,12 @@ mod test { #[test] fn binary_docs_redirect_to_crate() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("bat") .version("0.2.0") .binary(true) - .create_async() + .create() .await?; let web = env.web_app().await; web.assert_redirect("/bat/0.2.0", "/crate/bat/0.2.0") @@ -1001,12 +1001,12 @@ mod test { #[test] fn can_view_source() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("regex") .version("0.3.0") .source_file("src/main.rs", br#"println!("definitely valid rust")"#) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -1062,12 +1062,12 @@ mod test { assert_eq!(platform, 0); // sanity check the test is doing something - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.2.0") .add_platform("x86_64-unknown-linux-musl") - .create_async() + .create() .await?; let text = web.assert_success("/foo/0.2.0/foo/").await?.text().await?; let platform = kuchikiki::parse_html() @@ -1115,14 +1115,14 @@ mod test { release("1.0.0", &env).await; // in progress release - env.async_fake_release() + env.fake_release() .await .name("foo") .version("1.1.0") .builds(vec![ FakeBuild::default().build_status(BuildStatus::InProgress) ]) - .create_async() + .create() .await?; // STAR gives me the prod release diff --git a/src/web/releases.rs b/src/web/releases.rs index 5af8af930..d53c82a86 100644 --- a/src/web/releases.rs +++ b/src/web/releases.rs @@ -855,37 +855,37 @@ mod tests { async_wrapper(|env| async move { let db = env.async_db().await; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("1.0.0") .github_stats("ghost/foo", 10, 10, 10) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("bar") .version("1.0.0") .github_stats("ghost/bar", 20, 20, 20) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("bar") .version("1.0.0") .github_stats("ghost/bar", 20, 20, 20) - .create_async() + .create() .await?; // release without stars will not be shown - env.async_fake_release() + env.fake_release() .await .name("baz") .version("1.0.0") - .create_async() + .create() .await?; // release with only in-progress build (= in progress release) will not be shown - env.async_fake_release() + env.fake_release() .await .name("in_progress") .version("0.1.0") @@ -893,7 +893,7 @@ mod tests { .build_status(BuildStatus::InProgress) .rustc_version("rustc (blabla 2022-01-01)") .docsrs_version("docs.rs 4.0.0")]) - .create_async() + .create() .await?; let releases = @@ -919,16 +919,16 @@ mod tests { fn search_im_feeling_lucky_with_query_redirect_to_crate_page() { async_wrapper(|env| async move { let web = env.web_app().await; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") .build_result_failed() - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("some_other_crate") - .create_async() + .create() .await?; web.assert_redirect( @@ -944,15 +944,15 @@ mod tests { fn search_im_feeling_lucky_with_query_redirect_to_docs() { async_wrapper(|env| async move { let web = env.web_app().await; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("some_other_crate") - .create_async() + .create() .await?; web.assert_redirect( @@ -980,11 +980,11 @@ mod tests { .await?; let web = env.web_app().await; - env.async_fake_release() + env.fake_release() .await .github_stats("some/repo", 333, 22, 11) .name("some_random_crate") - .create_async() + .create() .await?; web.assert_redirect( "/releases/search?query=&i-am-feeling-lucky=1", @@ -999,15 +999,15 @@ mod tests { fn search_coloncolon_path_redirects_to_crate_docs() { async_wrapper(|env| async move { let web = env.web_app().await; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("some_other_crate") - .create_async() + .create() .await?; web.assert_redirect( @@ -1028,10 +1028,10 @@ mod tests { fn search_coloncolon_path_redirects_to_crate_docs_and_keeps_query() { async_wrapper(|env| async move { let web = env.web_app().await; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") - .create_async() + .create() .await?; web.assert_redirect( @@ -1052,10 +1052,10 @@ mod tests { }); let web = env.web_app().await; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") - .create_async() + .create() .await?; let _m = crates_io @@ -1114,10 +1114,10 @@ mod tests { }); let web = env.web_app().await; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") - .create_async() + .create() .await?; let _m = crates_io @@ -1280,10 +1280,10 @@ mod tests { }); let web = env.web_app().await; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") - .create_async() + .create() .await?; let _m = crates_io @@ -1333,10 +1333,10 @@ mod tests { }); let web = env.web_app().await; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") - .create_async() + .create() .await?; let _m = crates_io @@ -1386,36 +1386,36 @@ mod tests { }); let web = env.web_app().await; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") .version("2.0.0") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") .version("1.0.0") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("and_another_one") .version("0.0.1") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("yet_another_crate") .version("0.1.0") .yanked(true) - .create_async() + .create() .await?; // release with only in-progress build (= in progress release) will not be shown - env.async_fake_release() + env.fake_release() .await .name("in_progress") .version("0.1.0") @@ -1423,7 +1423,7 @@ mod tests { .build_status(BuildStatus::InProgress) .rustc_version("rustc (blabla 2022-01-01)") .docsrs_version("docs.rs 4.0.0")]) - .create_async() + .create() .await?; // release that failed in the fetch-step, will miss some details @@ -1499,40 +1499,40 @@ mod tests { #[test] fn releases_by_stars() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("crate_that_succeeded_with_github") .version("0.1.0") .github_stats("some/repo", 66, 22, 11) .release_time(Utc.with_ymd_and_hms(2020, 4, 16, 4, 33, 50).unwrap()) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("crate_that_succeeded_with_github") .version("0.2.0") .github_stats("some/repo", 66, 22, 11) .release_time(Utc.with_ymd_and_hms(2020, 4, 20, 4, 33, 50).unwrap()) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("crate_that_succeeded_without_github") .release_time(Utc.with_ymd_and_hms(2020, 5, 16, 4, 33, 50).unwrap()) .version("0.2.0") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("crate_that_failed_with_github") .version("0.1.0") .github_stats("some/repo", 33, 22, 11) .release_time(Utc.with_ymd_and_hms(2020, 6, 16, 4, 33, 50).unwrap()) .build_result_failed() - .create_async() + .create() .await?; let links = get_release_links("/releases/stars", &env.web_app().await).await?; @@ -1552,40 +1552,40 @@ mod tests { #[test] fn failures_by_stars() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("crate_that_succeeded_with_github") .version("0.1.0") .github_stats("some/repo", 66, 22, 11) .release_time(Utc.with_ymd_and_hms(2020, 4, 16, 4, 33, 50).unwrap()) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("crate_that_succeeded_with_github") .version("0.2.0") .github_stats("some/repo", 66, 22, 11) .release_time(Utc.with_ymd_and_hms(2020, 4, 20, 4, 33, 50).unwrap()) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("crate_that_succeeded_without_github") .release_time(Utc.with_ymd_and_hms(2020, 5, 16, 4, 33, 50).unwrap()) .version("0.2.0") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("crate_that_failed_with_github") .version("0.1.0") .github_stats("some/repo", 33, 22, 11) .release_time(Utc.with_ymd_and_hms(2020, 6, 16, 4, 33, 50).unwrap()) .build_result_failed() - .create_async() + .create() .await?; let links = get_release_links("/releases/failures", &env.web_app().await).await?; @@ -1601,30 +1601,30 @@ mod tests { #[test] fn releases_failed_by_time() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("crate_that_succeeded_with_github") .version("0.1.0") .github_stats("some/repo", 33, 22, 11) .release_time(Utc.with_ymd_and_hms(2020, 4, 16, 4, 33, 50).unwrap()) - .create_async() + .create() .await?; // make sure that crates get at most one release shown, so they don't crowd the page - env.async_fake_release() + env.fake_release() .await .name("crate_that_succeeded_with_github") .github_stats("some/repo", 33, 22, 11) .release_time(Utc.with_ymd_and_hms(2020, 5, 16, 4, 33, 50).unwrap()) .version("0.2.0") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("crate_that_failed") .version("0.1.0") .release_time(Utc.with_ymd_and_hms(2020, 6, 16, 4, 33, 50).unwrap()) .build_result_failed() - .create_async() + .create() .await?; let links = @@ -1640,38 +1640,38 @@ mod tests { #[test] fn releases_homepage_and_recent() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("crate_that_succeeded_with_github") .version("0.1.0") .github_stats("some/repo", 33, 22, 11) .release_time(Utc.with_ymd_and_hms(2020, 4, 16, 4, 33, 50).unwrap()) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("crate_that_succeeded_with_github") .version("0.2.0-rc") .github_stats("some/repo", 33, 22, 11) .release_time(Utc.with_ymd_and_hms(2020, 4, 16, 8, 33, 50).unwrap()) .build_result_failed() - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("crate_that_succeeded_with_github") .github_stats("some/repo", 33, 22, 11) .release_time(Utc.with_ymd_and_hms(2020, 5, 16, 4, 33, 50).unwrap()) .version("0.2.0") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("crate_that_failed") .version("0.1.0") .release_time(Utc.with_ymd_and_hms(2020, 6, 16, 4, 33, 50).unwrap()) .build_result_failed() - .create_async() + .create() .await?; // make sure that crates get at most one release shown, so they don't crowd the homepage @@ -1711,16 +1711,16 @@ mod tests { let text = response.text().await?; assert_eq!(text.matches(&empty_data).count(), 2); - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate_that_failed") .build_result_failed() - .create_async() + .create() .await?; // same when the release is on the current day, since we ignore today. @@ -1728,18 +1728,18 @@ mod tests { assert!(response.status().is_success()); assert_eq!(response.text().await?.matches(&empty_data).count(), 2); - env.async_fake_release() + env.fake_release() .await .name("some_random_crate_yesterday") .release_time(Utc::now() - Duration::try_days(1).unwrap()) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate_that_failed_yesterday") .build_result_failed() .release_time(Utc::now() - Duration::try_days(1).unwrap()) - .create_async() + .create() .await?; // with releases yesterday we get the data we want @@ -1761,16 +1761,16 @@ mod tests { let web = env.web_app().await; web.assert_success("/releases/feed").await?; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate_that_failed") .build_result_failed() - .create_async() + .create() .await?; web.assert_success("/releases/feed").await?; Ok(()) @@ -1870,7 +1870,7 @@ mod tests { queue.add_crate("foo", "1.0.0", 0, None).await?; queue.add_crate("bar", "0.1.0", 0, None).await?; - env.async_fake_release() + env.fake_release() .await .name("foo") .version("1.0.0") @@ -1878,7 +1878,7 @@ mod tests { .build_status(BuildStatus::InProgress) .rustc_version("rustc (blabla 2022-01-01)") .docsrs_version("docs.rs 4.0.0")]) - .create_async() + .create() .await?; let full = kuchikiki::parse_html().one(web.get("/releases/queue").await?.text().await?); @@ -1995,7 +1995,7 @@ mod tests { fn home_page_links() { async_wrapper(|env| async move { let web = env.web_app().await; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") .add_owner(CrateOwner { @@ -2003,7 +2003,7 @@ mod tests { avatar: "https://example.org/foobar".into(), kind: OwnerKind::User, }) - .create_async() + .create() .await?; let mut urls = vec![]; @@ -2110,10 +2110,10 @@ mod tests { }); let web = env.web_app().await; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") - .create_async() + .create() .await?; let _m = crates_io diff --git a/src/web/rustdoc.rs b/src/web/rustdoc.rs index b66a1e90b..526688958 100644 --- a/src/web/rustdoc.rs +++ b/src/web/rustdoc.rs @@ -926,13 +926,13 @@ mod test { // https://github.com/rust-lang/docs.rs/issues/2313 fn help_html(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("krate") .version("0.1.0") .archive_storage(archive_storage) .rustdoc_file("help.html") - .create_async() + .create() .await?; let web = env.web_app().await; web.assert_success_cached( @@ -951,7 +951,7 @@ mod test { fn settings_html(archive_storage: bool) { async_wrapper(|env| async move { // first release works, second fails - env.async_fake_release() + env.fake_release() .await .name("buggy") .version("0.1.0") @@ -963,15 +963,15 @@ mod test { .rustdoc_file("all.html") .rustdoc_file("directory_3/.gitignore") .rustdoc_file("directory_4/empty_file_no_ext") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("buggy") .version("0.2.0") .archive_storage(archive_storage) .build_result_failed() - .create_async() + .create() .await?; let web = env.web_app().await; web.assert_success_cached("/", CachePolicy::ShortInCdnAndBrowser, &env.config()) @@ -1032,13 +1032,13 @@ mod test { #[test_case(false)] fn default_target_redirects_to_base(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .archive_storage(archive_storage) .rustdoc_file("dummy/index.html") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -1062,14 +1062,14 @@ mod test { // set an explicit target that requires cross-compile let target = "x86_64-pc-windows-msvc"; - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.2.0") .archive_storage(archive_storage) .rustdoc_file("dummy/index.html") .default_target(target) - .create_async() + .create() .await?; let base = "/dummy/0.2.0/dummy/"; web.assert_success(base).await?; @@ -1079,7 +1079,7 @@ mod test { // set an explicit target without cross-compile // also check that /:crate/:version/:platform/all.html doesn't panic let target = "x86_64-unknown-linux-gnu"; - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.3.0") @@ -1087,7 +1087,7 @@ mod test { .rustdoc_file("dummy/index.html") .rustdoc_file("all.html") .default_target(target) - .create_async() + .create() .await?; let base = "/dummy/0.3.0/dummy/"; web.assert_success(base).await?; @@ -1107,13 +1107,13 @@ mod test { #[test] fn latest_url() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .archive_storage(true) .rustdoc_file("dummy/index.html") - .create_async() + .create() .await?; let resp = env @@ -1138,13 +1138,13 @@ mod test { config.cache_control_stale_while_revalidate = Some(2592000); }); - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .archive_storage(true) .rustdoc_file("dummy/index.html") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -1169,7 +1169,7 @@ mod test { #[test_case(false)] fn go_to_latest_version(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") @@ -1177,16 +1177,16 @@ mod test { .rustdoc_file("dummy/blah/index.html") .rustdoc_file("dummy/blah/blah.html") .rustdoc_file("dummy/struct.will-be-deleted.html") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.2.0") .archive_storage(archive_storage) .rustdoc_file("dummy/blah/index.html") .rustdoc_file("dummy/blah/blah.html") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -1231,22 +1231,22 @@ mod test { #[test_case(false)] fn go_to_latest_version_keeps_platform(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .archive_storage(archive_storage) .add_platform("x86_64-pc-windows-msvc") .rustdoc_file("dummy/struct.Blah.html") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.2.0") .archive_storage(archive_storage) .add_platform("x86_64-pc-windows-msvc") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -1292,21 +1292,21 @@ mod test { #[test_case(false)] fn redirect_latest_goes_to_crate_if_build_failed(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .archive_storage(archive_storage) .rustdoc_file("dummy/index.html") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.2.0") .archive_storage(archive_storage) .build_result_failed() - .create_async() + .create() .await?; let web = env.web_app().await; @@ -1322,30 +1322,30 @@ mod test { #[test_case(false)] fn redirect_latest_does_not_go_to_yanked_versions(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .archive_storage(archive_storage) .rustdoc_file("dummy/index.html") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.2.0") .archive_storage(archive_storage) .rustdoc_file("dummy/index.html") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.2.1") .archive_storage(archive_storage) .rustdoc_file("dummy/index.html") .yanked(true) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -1383,26 +1383,26 @@ mod test { async_wrapper(|env| async move { let web = env.web_app().await; - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .archive_storage(archive_storage) .rustdoc_file("dummy/index.html") .yanked(true) - .create_async() + .create() .await?; assert!(has_yanked_warning("/dummy/0.1.0/dummy/", &web).await?); - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.2.0") .archive_storage(archive_storage) .rustdoc_file("dummy/index.html") .yanked(true) - .create_async() + .create() .await?; assert!(has_yanked_warning("/dummy/0.1.0/dummy/", &web).await?); @@ -1414,11 +1414,11 @@ mod test { #[test] fn badges_are_urlencoded() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("zstd") .version("0.5.1+zstd.1.4.4") - .create_async() + .create() .await?; let frontend = env.web_app().await; @@ -1440,13 +1440,13 @@ mod test { #[test_case(false)] fn crate_name_percent_decoded_redirect(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("fake-crate") .version("0.0.1") .archive_storage(archive_storage) .rustdoc_file("fake_crate/index.html") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -1471,13 +1471,13 @@ mod test { ]; for (name, version) in &rels { - env.async_fake_release() + env.fake_release() .await .name(name) .version(version) .archive_storage(archive_storage) .rustdoc_file(&(name.replace('-', "_") + "/index.html")) - .create_async() + .create() .await?; } @@ -1528,22 +1528,22 @@ mod test { #[test_case(false)] fn specific_pages_do_not_handle_mismatched_separators(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy-dash") .version("0.1.0") .archive_storage(archive_storage) .rustdoc_file("dummy_dash/index.html") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("dummy_mixed-separators") .version("0.1.0") .archive_storage(archive_storage) .rustdoc_file("dummy_mixed_separators/index.html") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -1652,7 +1652,7 @@ mod test { let web = env.web_app().await; // no explicit default-target - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") @@ -1660,7 +1660,7 @@ mod test { .rustdoc_file("dummy/index.html") .rustdoc_file("dummy/struct.Dummy.html") .add_target("x86_64-unknown-linux-gnu") - .create_async() + .create() .await?; assert_platform_links( @@ -1712,7 +1712,7 @@ mod test { .await?; // set an explicit target that requires cross-compile - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.2.0") @@ -1720,7 +1720,7 @@ mod test { .rustdoc_file("dummy/index.html") .rustdoc_file("dummy/struct.Dummy.html") .default_target("x86_64-pc-windows-msvc") - .create_async() + .create() .await?; assert_platform_links( @@ -1772,7 +1772,7 @@ mod test { .await?; // set an explicit target without cross-compile - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.3.0") @@ -1780,7 +1780,7 @@ mod test { .rustdoc_file("dummy/index.html") .rustdoc_file("dummy/struct.Dummy.html") .default_target("x86_64-unknown-linux-gnu") - .create_async() + .create() .await?; assert_platform_links( @@ -1832,7 +1832,7 @@ mod test { .await?; // multiple targets - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.4.0") @@ -1847,7 +1847,7 @@ mod test { .rustdoc_file("x86_64-pc-windows-msvc/dummy/struct.WindowsOnly.html") .default_target("x86_64-unknown-linux-gnu") .add_target("x86_64-pc-windows-msvc") - .create_async() + .create() .await?; assert_platform_links( @@ -1986,12 +1986,12 @@ mod test { #[test] fn test_target_redirect_with_corrected_name() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo_ab") .version("0.0.1") .archive_storage(true) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -2021,11 +2021,11 @@ mod test { #[test] fn test_redirect_to_latest_302() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("1.0.0") - .create_async() + .create() .await?; let web = env.web_app().await; let resp = web @@ -2041,13 +2041,13 @@ mod test { #[test_case(false)] fn test_fully_yanked_crate_404s(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("1.0.0") .archive_storage(archive_storage) .yanked(true) - .create_async() + .create() .await?; assert_eq!( @@ -2073,12 +2073,12 @@ mod test { fn test_no_trailing_target_slash(archive_storage: bool) { // regression test for https://github.com/rust-lang/docs.rs/issues/856 async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .archive_storage(archive_storage) - .create_async() + .create() .await?; let web = env.web_app().await; web.assert_redirect( @@ -2086,13 +2086,13 @@ mod test { "/dummy/0.1.0/dummy/", ) .await?; - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.2.0") .archive_storage(archive_storage) .add_platform("x86_64-apple-darwin") - .create_async() + .create() .await?; web.assert_redirect( "/crate/dummy/0.2.0/target-redirect/x86_64-apple-darwin", @@ -2112,15 +2112,15 @@ mod test { fn test_redirect_crate_coloncolon_path() { async_wrapper(|env| async move { let web = env.web_app().await; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("some_other_crate") - .create_async() + .create() .await?; web.assert_redirect( @@ -2153,11 +2153,11 @@ mod test { fn test_no_panic_on_missing_kind() { async_wrapper(|env| async move { let id = env - .async_fake_release() + .fake_release() .await .name("strum") .version("0.13.0") - .create_async() + .create() .await?; let mut conn = env.async_db().await.async_conn().await; @@ -2178,12 +2178,12 @@ mod test { fn test_readme_rendered_as_html() { async_wrapper(|env| async move { let readme = "# Overview"; - env.async_fake_release() + env.fake_release() .await .name("strum") .version("0.18.0") .readme(readme) - .create_async() + .create() .await?; let page = kuchikiki::parse_html().one( env.web_app() @@ -2207,18 +2207,18 @@ mod test { // regression test for https://github.com/rust-lang/docs.rs/pull/885#issuecomment-655149288 fn test_build_status_is_accurate() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("hexponent") .version("0.3.0") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("hexponent") .version("0.2.0") .build_result_failed() - .create_async() + .create() .await?; let web = env.web_app().await; @@ -2249,13 +2249,13 @@ mod test { #[test_case(false)] fn test_no_trailing_rustdoc_slash(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("tokio") .version("0.2.21") .archive_storage(archive_storage) .rustdoc_file("tokio/time/index.html") - .create_async() + .create() .await?; env.web_app() @@ -2274,13 +2274,13 @@ mod test { #[test_case(false)] fn test_non_ascii(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("const_unit_poc") .version("1.0.0") .archive_storage(archive_storage) .rustdoc_file("const_unit_poc/units/constant.Ω.html") - .create_async() + .create() .await?; env.web_app() .await @@ -2296,21 +2296,21 @@ mod test { #[test_case(false)] fn test_latest_version_keeps_query(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("tungstenite") .version("0.10.0") .archive_storage(archive_storage) .rustdoc_file("tungstenite/index.html") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("tungstenite") .version("0.11.0") .archive_storage(archive_storage) .rustdoc_file("tungstenite/index.html") - .create_async() + .create() .await?; assert_eq!( latest_version_redirect( @@ -2328,19 +2328,19 @@ mod test { #[test_case(false)] fn latest_version_works_when_source_deleted(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("pyo3") .version("0.2.7") .archive_storage(archive_storage) .source_file("src/objects/exc.rs", b"//! some docs") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("pyo3") .version("0.13.2") - .create_async() + .create() .await?; let target_redirect = "/crate/pyo3/latest/target-redirect/x86_64-unknown-linux-gnu/src/pyo3/objects/exc.rs.html"; let web = env.web_app().await; @@ -2373,22 +2373,22 @@ mod test { #[test_case(false)] fn test_version_link_goes_to_docs(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("hexponent") .version("0.3.0") .archive_storage(archive_storage) .rustdoc_file("hexponent/index.html") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("hexponent") .version("0.3.1") .archive_storage(archive_storage) .rustdoc_file("hexponent/index.html") .rustdoc_file("hexponent/something.html") - .create_async() + .create() .await?; // test rustdoc pages stay on the documentation @@ -2446,13 +2446,13 @@ mod test { #[test] fn test_repository_link_in_topbar_dropdown() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("testing") .repo("https://git.example.com") .version("0.1.0") .rustdoc_file("testing/index.html") - .create_async() + .create() .await?; let dom = kuchikiki::parse_html().one( @@ -2478,13 +2478,13 @@ mod test { #[test] fn test_repository_link_in_topbar_dropdown_github() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("testing") .version("0.1.0") .rustdoc_file("testing/index.html") .github_stats("https://git.example.com", 123, 321, 333) - .create_async() + .create() .await?; let dom = kuchikiki::parse_html().one( @@ -2510,7 +2510,7 @@ mod test { #[test] fn test_owner_links_with_team() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("testing") .version("0.1.0") @@ -2524,7 +2524,7 @@ mod test { kind: OwnerKind::Team, avatar: "".into(), }) - .create_async() + .create() .await?; let dom = kuchikiki::parse_html().one( @@ -2568,7 +2568,7 @@ mod test { #[test] fn test_dependency_optional_suffix() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("testing") .version("0.1.0") @@ -2577,7 +2577,7 @@ mod test { Dependency::new("optional-dep".to_string(), "1.2.3".to_string()) .set_optional(true), ) - .create_async() + .create() .await?; let dom = kuchikiki::parse_html().one( @@ -2614,13 +2614,13 @@ mod test { #[test_case(false)] fn test_missing_target_redirects_to_search(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("winapi") .version("0.3.9") .archive_storage(archive_storage) .rustdoc_file("winapi/macro.ENUM.html") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -2641,21 +2641,21 @@ mod test { #[test_case(false)] fn test_redirect_source_not_rust(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("winapi") .version("0.3.8") .archive_storage(archive_storage) .source_file("src/docs.md", b"created by Peter Rabbit") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("winapi") .version("0.3.9") .archive_storage(archive_storage) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -2674,12 +2674,12 @@ mod test { #[test] fn noindex_nonlatest() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .rustdoc_file("dummy/index.html") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -2719,12 +2719,12 @@ mod test { #[test] fn download_old_storage_version_404() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .archive_storage(false) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -2742,12 +2742,12 @@ mod test { env.override_config(|config| { config.s3_static_root_path = "https://static.docs.rs".into() }); - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .archive_storage(true) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -2775,12 +2775,12 @@ mod test { env.override_config(|config| { config.s3_static_root_path = "https://static.docs.rs".into() }); - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .archive_storage(true) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -2809,20 +2809,20 @@ mod test { env.override_config(|config| { config.s3_static_root_path = "https://static.docs.rs".into() }); - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .archive_storage(true) - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.2.0") .archive_storage(true) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -2848,13 +2848,13 @@ mod test { #[test_case("something.css")] fn serve_release_specific_static_assets(name: &str) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .archive_storage(true) .rustdoc_file_with(name, b"content") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -2871,12 +2871,12 @@ mod test { fn fallback_to_root_storage_for_some_js_assets(path: &str) { // test workaround for https://github.com/rust-lang/docs.rs/issues/1979 async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("dummy") .version("0.1.0") .archive_storage(true) - .create_async() + .create() .await?; let storage = env.async_storage().await; @@ -2903,12 +2903,12 @@ mod test { #[test] fn redirect_with_encoded_chars_in_path() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("clap") .version("2.24.0") .archive_storage(true) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -2926,12 +2926,12 @@ mod test { #[test] fn search_with_encoded_chars_in_path() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("clap") .version("2.24.0") .archive_storage(true) - .create_async() + .create() .await?; let web = env.web_app().await; @@ -2950,13 +2950,13 @@ mod test { #[test_case("/something/latest/some_path/", "/crate/something/latest")] fn rustdoc_page_from_failed_build_redirects_to_crate(path: &str, expected: &str) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("something") .version("1.2.3") .archive_storage(true) .build_result_failed() - .create_async() + .create() .await?; let web = env.web_app().await; diff --git a/src/web/sitemap.rs b/src/web/sitemap.rs index 6cc9caadf..128349a42 100644 --- a/src/web/sitemap.rs +++ b/src/web/sitemap.rs @@ -245,16 +245,16 @@ mod tests { .await?; } - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") - .create_async() + .create() .await?; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate_that_failed") .build_result_failed() - .create_async() + .create() .await?; // these fake crates appear only in the `s` sitemap @@ -283,11 +283,11 @@ mod tests { let web = env.web_app().await; use chrono::{TimeZone, Utc}; - env.async_fake_release() + env.fake_release() .await .name("some_random_crate") .release_time(Utc.with_ymd_and_hms(2020, 1, 1, 0, 0, 0).unwrap()) - .create_async() + .create() .await?; let response = web.get("/-/sitemap/s/sitemap.xml").await?; diff --git a/src/web/source.rs b/src/web/source.rs index 6ee1c7507..93cd8a85d 100644 --- a/src/web/source.rs +++ b/src/web/source.rs @@ -371,13 +371,13 @@ mod tests { async_wrapper(|env| async move { let filename = "序.pdf"; - env.async_fake_release() + env.fake_release() .await .archive_storage(archive_storage) .name("fake") .version("0.1.0") .source_file(filename, b"some_random_content") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -401,13 +401,13 @@ mod tests { #[test_case(false)] fn fetch_source_file_content(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .archive_storage(archive_storage) .name("fake") .version("0.1.0") .source_file("some_filename.rs", b"some_random_content") - .create_async() + .create() .await?; let web = env.web_app().await; web.assert_success_cached( @@ -433,13 +433,13 @@ mod tests { #[test_case(false)] fn fetch_binary(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .archive_storage(archive_storage) .name("fake") .version("0.1.0") .source_file("some_file.pdf", b"some_random_content") - .create_async() + .create() .await?; let web = env.web_app().await; let response = web.get("/crate/fake/0.1.0/source/some_file.pdf").await?; @@ -469,14 +469,14 @@ mod tests { #[test_case(false)] fn cargo_ok_not_skipped(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .archive_storage(archive_storage) .name("fake") .version("0.1.0") .source_file(".cargo-ok", b"ok") .source_file("README.md", b"hello") - .create_async() + .create() .await?; let web = env.web_app().await; web.assert_success("/crate/fake/0.1.0/source/").await?; @@ -489,13 +489,13 @@ mod tests { fn empty_file_list_dont_break_the_view(archive_storage: bool) { async_wrapper(|env| async move { let release_id = env - .async_fake_release() + .fake_release() .await .archive_storage(archive_storage) .name("fake") .version("0.1.0") .source_file("README.md", b"hello") - .create_async() + .create() .await?; let path = "/crate/fake/0.1.0/source/README.md"; @@ -521,14 +521,14 @@ mod tests { #[test] fn latest_contains_links_to_latest() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .archive_storage(true) .name("fake") .version("0.1.0") .source_file(".cargo-ok", b"ok") .source_file("README.md", b"hello") - .create_async() + .create() .await?; let resp = env .web_app() @@ -550,12 +550,12 @@ mod tests { #[test_case(false)] fn directory_not_found(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .archive_storage(archive_storage) .name("mbedtls") .version("0.2.0") - .create_async() + .create() .await?; let web = env.web_app().await; web.assert_success("/crate/mbedtls/0.2.0/source/test/") @@ -568,13 +568,13 @@ mod tests { #[test_case(false)] fn semver_handled_latest(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .archive_storage(archive_storage) .name("mbedtls") .version("0.2.0") .source_file("README.md", b"hello") - .create_async() + .create() .await?; let web = env.web_app().await; web.assert_success("/crate/mbedtls/0.2.0/source/").await?; @@ -593,13 +593,13 @@ mod tests { #[test_case(false)] fn semver_handled(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .archive_storage(archive_storage) .name("mbedtls") .version("0.2.0") .source_file("README.md", b"hello") - .create_async() + .create() .await?; let web = env.web_app().await; web.assert_success("/crate/mbedtls/0.2.0/source/").await?; @@ -618,14 +618,14 @@ mod tests { #[test_case(false)] fn literal_krate_description(archive_storage: bool) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .archive_storage(archive_storage) .name("rustc-ap-syntax") .version("178.0.0") .description("some stuff with krate") .source_file("fold.rs", b"fn foo() {}") - .create_async() + .create() .await?; let web = env.web_app().await; web.assert_success_cached( @@ -641,13 +641,13 @@ mod tests { #[test] fn cargo_special_filetypes_are_highlighted() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("fake") .version("0.1.0") .source_file("Cargo.toml.orig", b"[package]") .source_file("Cargo.lock", b"[dependencies]") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -673,12 +673,12 @@ mod tests { #[test] fn dotfiles_with_extension_are_highlighted() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("fake") .version("0.1.0") .source_file(".rustfmt.toml", b"[rustfmt]") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -697,13 +697,13 @@ mod tests { #[test] fn json_is_served_as_rendered_html() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("fake") .version("0.1.0") .source_file("Cargo.toml", b"") .source_file("config.json", b"{}") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -733,7 +733,7 @@ mod tests { #[test] fn root_file_list() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("fake") .version("0.1.0") @@ -741,7 +741,7 @@ mod tests { .source_file("folder1/some_filename.rs", b"some_random_content") .source_file("folder2/another_filename.rs", b"some_random_content") .source_file("root_filename.rs", b"some_random_content") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -766,7 +766,7 @@ mod tests { #[test] fn child_file_list() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("fake") .version("0.1.0") @@ -774,7 +774,7 @@ mod tests { .source_file("folder1/more_filenames.rs", b"some_random_content") .source_file("folder2/another_filename.rs", b"some_random_content") .source_file("root_filename.rs", b"some_random_content") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -800,12 +800,12 @@ mod tests { config.max_file_size = 1; config.max_file_size_html = 1; }); - env.async_fake_release() + env.fake_release() .await .name("fake") .version("0.1.0") .source_file("large_file.rs", b"some_random_content") - .create_async() + .create() .await?; let web = env.web_app().await; diff --git a/src/web/status.rs b/src/web/status.rs index c65f36e55..61aaa03b3 100644 --- a/src/web/status.rs +++ b/src/web/status.rs @@ -57,11 +57,11 @@ mod tests { #[test_case("=0.1.0"; "exact_version")] fn status(version: &str) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") - .create_async() + .create() .await?; let response = env @@ -89,11 +89,11 @@ mod tests { #[test] fn redirect_latest() { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -111,11 +111,11 @@ mod tests { #[test_case("~0.1"; "semver")] fn redirect(version: &str) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") - .create_async() + .create() .await?; let web = env.web_app().await; @@ -138,12 +138,12 @@ mod tests { #[test_case("=0.1.0"; "exact_version")] fn failure(version: &str) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.0") .build_result_failed() - .create_async() + .create() .await?; let response = env @@ -181,11 +181,11 @@ mod tests { #[test_case("foo", "0,1,0")] fn not_found(krate: &str, version: &str) { async_wrapper(|env| async move { - env.async_fake_release() + env.fake_release() .await .name("foo") .version("0.1.1") - .create_async() + .create() .await?; let response = env