Skip to content

Commit 60cf31c

Browse files
committed
models/default_versions: Migrate test suite to async/await
1 parent ca23df2 commit 60cf31c

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

src/models/default_versions.rs

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -331,18 +331,19 @@ mod tests {
331331
buf
332332
}
333333

334-
fn create_crate(name: &str, conn: &mut impl Conn) -> i32 {
335-
use diesel::RunQueryDsl;
334+
async fn create_crate(name: &str, conn: &mut AsyncPgConnection) -> i32 {
335+
use diesel_async::RunQueryDsl;
336336

337337
diesel::insert_into(crates::table)
338338
.values(crates::name.eq(name))
339339
.returning(crates::id)
340340
.get_result(conn)
341+
.await
341342
.unwrap()
342343
}
343344

344-
fn create_version(crate_id: i32, num: &str, conn: &mut impl Conn) {
345-
use diesel::RunQueryDsl;
345+
async fn create_version(crate_id: i32, num: &str, conn: &mut AsyncPgConnection) {
346+
use diesel_async::RunQueryDsl;
346347

347348
diesel::insert_into(versions::table)
348349
.values((
@@ -353,36 +354,38 @@ mod tests {
353354
versions::crate_size.eq(0),
354355
))
355356
.execute(conn)
357+
.await
356358
.unwrap();
357359
}
358360

359-
fn get_default_version(crate_id: i32, conn: &mut impl Conn) -> String {
360-
use diesel::RunQueryDsl;
361+
async fn get_default_version(crate_id: i32, conn: &mut AsyncPgConnection) -> String {
362+
use diesel_async::RunQueryDsl;
361363

362364
default_versions::table
363365
.inner_join(versions::table)
364366
.select(versions::num)
365367
.filter(default_versions::crate_id.eq(crate_id))
366368
.first(conn)
369+
.await
367370
.unwrap()
368371
}
369372

370-
#[test]
371-
fn test_update_default_version() {
373+
#[tokio::test]
374+
async fn test_update_default_version() {
372375
let test_db = TestDatabase::new();
373-
let conn = &mut test_db.connect();
376+
let conn = &mut test_db.async_connect().await;
374377

375-
let crate_id = create_crate("foo", conn);
376-
create_version(crate_id, "1.0.0", conn);
378+
let crate_id = create_crate("foo", conn).await;
379+
create_version(crate_id, "1.0.0", conn).await;
377380

378-
update_default_version(crate_id, conn).unwrap();
379-
assert_eq!(get_default_version(crate_id, conn), "1.0.0");
381+
async_update_default_version(crate_id, conn).await.unwrap();
382+
assert_eq!(get_default_version(crate_id, conn).await, "1.0.0");
380383

381-
create_version(crate_id, "1.1.0", conn);
382-
create_version(crate_id, "1.0.1", conn);
383-
assert_eq!(get_default_version(crate_id, conn), "1.0.0");
384+
create_version(crate_id, "1.1.0", conn).await;
385+
create_version(crate_id, "1.0.1", conn).await;
386+
assert_eq!(get_default_version(crate_id, conn).await, "1.0.0");
384387

385-
update_default_version(crate_id, conn).unwrap();
386-
assert_eq!(get_default_version(crate_id, conn), "1.1.0");
388+
async_update_default_version(crate_id, conn).await.unwrap();
389+
assert_eq!(get_default_version(crate_id, conn).await, "1.1.0");
387390
}
388391
}

0 commit comments

Comments
 (0)