Skip to content

Commit 1cceeaf

Browse files
Koenraad VerheydenJoshua Nelson
authored andcommitted
expand create_release test wrapper
1 parent 7f53f2b commit 1cceeaf

File tree

1 file changed

+17
-23
lines changed

1 file changed

+17
-23
lines changed

src/web/crate_details.rs

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -313,20 +313,14 @@ pub fn crate_details_handler(req: &mut Request) -> IronResult<Response> {
313313
}
314314
}
315315

316+
317+
316318
#[cfg(test)]
317319
mod tests {
318320
use super::*;
319321
use crate::test::TestDatabase;
320322
use failure::Error;
321323

322-
fn create_release(db: &TestDatabase, package: &str, version: &str, successful: bool) -> Result<i32, Error> {
323-
db.fake_release()
324-
.name(package)
325-
.version(version)
326-
.build_result_successful(successful)
327-
.create()
328-
}
329-
330324
fn assert_last_successful_build_equals(
331325
db: &TestDatabase,
332326
package: &str,
@@ -349,9 +343,9 @@ mod tests {
349343
crate::test::wrapper(|env| {
350344
let db = env.db();
351345

352-
create_release(&db, "foo", "0.0.1", true)?;
353-
create_release(&db, "foo", "0.0.2", true)?;
354-
create_release(&db, "foo", "0.0.3", false)?;
346+
db.fake_release().name("foo").version("0.0.1").create()?;
347+
db.fake_release().name("foo").version("0.0.2").create()?;
348+
db.fake_release().name("foo").version("0.0.3").build_result_successful(false).create()?;
355349

356350
assert_last_successful_build_equals(&db, "foo", "0.0.1", None)?;
357351
assert_last_successful_build_equals(&db, "foo", "0.0.2", None)?;
@@ -365,8 +359,8 @@ mod tests {
365359
crate::test::wrapper(|env| {
366360
let db = env.db();
367361

368-
create_release(&db, "foo", "0.0.1", false)?;
369-
create_release(&db, "foo", "0.0.2", false)?;
362+
db.fake_release().name("foo").version("0.0.1").build_result_successful(false).create()?;
363+
db.fake_release().name("foo").version("0.0.2").build_result_successful(false).create()?;
370364

371365
assert_last_successful_build_equals(&db, "foo", "0.0.1", None)?;
372366
assert_last_successful_build_equals(&db, "foo", "0.0.2", None)?;
@@ -379,9 +373,9 @@ mod tests {
379373
crate::test::wrapper(|env| {
380374
let db = env.db();
381375

382-
create_release(&db, "foo", "0.0.1", true)?;
383-
create_release(&db, "foo", "0.0.2", false)?;
384-
create_release(&db, "foo", "0.0.3", true)?;
376+
db.fake_release().name("foo").version("0.0.1").create()?;
377+
db.fake_release().name("foo").version("0.0.2").build_result_successful(false).create()?;
378+
db.fake_release().name("foo").version("0.0.3").create()?;
385379

386380
assert_last_successful_build_equals(&db, "foo", "0.0.1", None)?;
387381
assert_last_successful_build_equals(&db, "foo", "0.0.2", Some("0.0.3"))?;
@@ -396,13 +390,13 @@ mod tests {
396390
let db = env.db();
397391

398392
// Add new releases of 'foo' out-of-order since CrateDetails should sort them descending
399-
create_release(&db, "foo", "0.1.0", true)?;
400-
create_release(&db, "foo", "0.1.1", true)?;
401-
create_release(&db, "foo", "0.3.0", false)?;
402-
create_release(&db, "foo", "1.0.0", true)?;
403-
create_release(&db, "foo", "0.12.0", true)?;
404-
create_release(&db, "foo", "0.2.0", true)?;
405-
create_release(&db, "foo", "0.2.0-alpha", true)?;
393+
db.fake_release().name("foo").version("0.1.0").create()?;
394+
db.fake_release().name("foo").version("0.1.1").create()?;
395+
db.fake_release().name("foo").version("0.3.0").build_result_successful(false).create()?;
396+
db.fake_release().name("foo").version("1.0.0").create()?;
397+
db.fake_release().name("foo").version("0.12.0").create()?;
398+
db.fake_release().name("foo").version("0.2.0").create()?;
399+
db.fake_release().name("foo").version("0.2.0-alpha").create()?;
406400

407401
let details = CrateDetails::new(&db.conn(), "foo", "0.2.0").unwrap();
408402
assert_eq!(details.releases, vec![

0 commit comments

Comments
 (0)