Skip to content

Commit ca83d0d

Browse files
committed
tests: Move GET /crates/:name/dependencies test to krate::dependencies module
1 parent 6930a33 commit ca83d0d

File tree

2 files changed

+33
-26
lines changed

2 files changed

+33
-26
lines changed

src/tests/krate/dependencies.rs

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
use crate::builders::{CrateBuilder, VersionBuilder};
2+
use crate::new_dependency;
3+
use crate::util::{RequestHelper, TestApp};
4+
use cargo_registry::views::EncodableDependency;
5+
use http::StatusCode;
6+
7+
#[derive(Deserialize)]
8+
struct Deps {
9+
dependencies: Vec<EncodableDependency>,
10+
}
11+
12+
#[test]
13+
fn dependencies() {
14+
let (app, anon, user) = TestApp::init().with_user();
15+
let user = user.as_model();
16+
17+
app.db(|conn| {
18+
let c1 = CrateBuilder::new("foo_deps", user.id).expect_build(conn);
19+
let v = VersionBuilder::new("1.0.0").expect_build(c1.id, user.id, conn);
20+
let c2 = CrateBuilder::new("bar_deps", user.id).expect_build(conn);
21+
new_dependency(conn, &v, &c2);
22+
});
23+
24+
let deps: Deps = anon
25+
.get("/api/v1/crates/foo_deps/1.0.0/dependencies")
26+
.good();
27+
assert_eq!(deps.dependencies[0].crate_id, "bar_deps");
28+
29+
anon.get::<()>("/api/v1/crates/foo_deps/1.0.2/dependencies")
30+
.bad_with_status(StatusCode::OK);
31+
}

src/tests/krate/mod.rs

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{
22
builders::{CrateBuilder, PublishBuilder, VersionBuilder},
3-
new_category, new_dependency, new_user, CrateMeta, OkBool, RequestHelper, TestApp,
3+
new_category, new_user, CrateMeta, OkBool, RequestHelper, TestApp,
44
};
55
use cargo_registry::{
66
models::Category,
@@ -11,15 +11,12 @@ use cargo_registry::{
1111
use conduit::StatusCode;
1212
use diesel::{dsl::*, prelude::*, update};
1313

14+
mod dependencies;
1415
mod downloads;
1516
mod publish;
1617
mod summary;
1718
mod versions;
1819

19-
#[derive(Deserialize)]
20-
struct Deps {
21-
dependencies: Vec<EncodableDependency>,
22-
}
2320
#[derive(Deserialize)]
2421
struct RevDeps {
2522
dependencies: Vec<EncodableDependency>,
@@ -637,27 +634,6 @@ fn yanked_versions_are_not_considered_for_max_version() {
637634
assert_eq!(json.crates[0].max_version, "1.0.0");
638635
}
639636

640-
#[test]
641-
fn dependencies() {
642-
let (app, anon, user) = TestApp::init().with_user();
643-
let user = user.as_model();
644-
645-
app.db(|conn| {
646-
let c1 = CrateBuilder::new("foo_deps", user.id).expect_build(conn);
647-
let v = VersionBuilder::new("1.0.0").expect_build(c1.id, user.id, conn);
648-
let c2 = CrateBuilder::new("bar_deps", user.id).expect_build(conn);
649-
new_dependency(conn, &v, &c2);
650-
});
651-
652-
let deps: Deps = anon
653-
.get("/api/v1/crates/foo_deps/1.0.0/dependencies")
654-
.good();
655-
assert_eq!(deps.dependencies[0].crate_id, "bar_deps");
656-
657-
anon.get::<()>("/api/v1/crates/foo_deps/1.0.2/dependencies")
658-
.bad_with_status(StatusCode::OK);
659-
}
660-
661637
#[test]
662638
fn diesel_not_found_results_in_404() {
663639
let (_, _, user) = TestApp::init().with_user();

0 commit comments

Comments
 (0)