tests/builders/version: Remove sync build() fns

Author: Turbo87

src/tests/builders/krate.rs

@@ -141,7 +141,7 @@ impl<'a> CrateBuilder<'a> {
         let mut last_version_id = 0;
         for version_builder in self.versions {
             last_version_id = version_builder
-                .async_build(krate.id, self.owner_id, connection)
+                .build(krate.id, self.owner_id, connection)
                 .await?
                 .id;
         }

src/tests/builders/version.rs

@@ -91,7 +91,7 @@ impl VersionBuilder {
         self
     }
 
-    pub async fn async_build(
+    pub async fn build(
         self,
         crate_id: i32,
         published_by: i32,
@@ -142,83 +142,19 @@ impl VersionBuilder {
         Ok(vers)
     }
 
-    pub fn build(
-        self,
-        crate_id: i32,
-        published_by: i32,
-        connection: &mut PgConnection,
-    ) -> AppResult<Version> {
-        use diesel::{insert_into, RunQueryDsl};
-
-        let version = self.num.to_string();
-
-        let new_version = NewVersion::builder(crate_id, &version)
-            .features(serde_json::to_value(&self.features)?)
-            .maybe_license(self.license.as_deref())
-            .size(self.size)
-            .published_by(published_by)
-            .checksum(&self.checksum)
-            .maybe_links(self.links.as_deref())
-            .maybe_rust_version(self.rust_version.as_deref())
-            .yanked(self.yanked)
-            .maybe_created_at(self.created_at.as_ref())
-            .build();
-
-        let vers = new_version.save(connection, "[email protected]")?;
-
-        let new_deps = self
-            .dependencies
-            .into_iter()
-            .map(|(crate_id, target)| {
-                (
-                    dependencies::version_id.eq(vers.id),
-                    dependencies::req.eq(">= 0"),
-                    dependencies::crate_id.eq(crate_id),
-                    dependencies::target.eq(target),
-                    dependencies::optional.eq(false),
-                    dependencies::default_features.eq(false),
-                    dependencies::features.eq(Vec::<String>::new()),
-                )
-            })
-            .collect::<Vec<_>>();
-        insert_into(dependencies::table)
-            .values(&new_deps)
-            .execute(connection)?;
-
-        Ok(vers)
-    }
-
     /// Consumes the builder and creates the version record in the database.
     ///
     /// # Panics
     ///
     /// Panics (and fails the test) if any part of inserting the version record fails.
-    pub async fn async_expect_build(
+    pub async fn expect_build(
         self,
         crate_id: i32,
         published_by: i32,
         connection: &mut AsyncPgConnection,
-    ) -> Version {
-        self.async_build(crate_id, published_by, connection)
-            .await
-            .unwrap_or_else(|e| {
-                panic!("Unable to create version: {e:?}");
-            })
-    }
-
-    /// Consumes the builder and creates the version record in the database.
-    ///
-    /// # Panics
-    ///
-    /// Panics (and fails the test) if any part of inserting the version record fails.
-    #[track_caller]
-    pub fn expect_build(
-        self,
-        crate_id: i32,
-        published_by: i32,
-        connection: &mut PgConnection,
     ) -> Version {
         self.build(crate_id, published_by, connection)
+            .await
             .unwrap_or_else(|e| {
                 panic!("Unable to create version: {e:?}");
             })

src/tests/routes/crates/versions/dependencies.rs

@@ -23,7 +23,7 @@ async fn dependencies() {
         .await;
     VersionBuilder::new("1.0.0")
         .dependency(&c2, None)
-        .async_expect_build(c1.id, user.id, &mut conn)
+        .expect_build(c1.id, user.id, &mut conn)
         .await;
 
     let deps: Deps = anon

src/tests/routes/crates/versions/read.rs

@@ -17,7 +17,7 @@ async fn show_by_crate_name_and_version() {
         .size(1234)
         .checksum("c241cd77c3723ccf1aa453f169ee60c0a888344da504bee0142adb859092acb4")
         .rust_version("1.64")
-        .async_expect_build(krate.id, user.id, &mut conn)
+        .expect_build(krate.id, user.id, &mut conn)
         .await;
 
     let url = "/api/v1/crates/foo_vers_show/2.0.0";
@@ -44,7 +44,7 @@ async fn show_by_crate_name_and_semver_no_published_by() {
         .expect_build(&mut async_conn)
         .await;
     let version = VersionBuilder::new("1.0.0")
-        .async_expect_build(krate.id, user.id, &mut async_conn)
+        .expect_build(krate.id, user.id, &mut async_conn)
         .await;
 
     // Mimic a version published before we started recording who published versions

src/tests/version.rs

@@ -12,7 +12,7 @@ async fn record_rerendered_readme_time() {
         .expect_build(&mut conn)
         .await;
     let version = VersionBuilder::new("1.0.0")
-        .async_expect_build(c.id, user.id, &mut conn)
+        .expect_build(c.id, user.id, &mut conn)
         .await;
 
     let mut conn = app.async_db_conn().await;