Skip to content

Commit b3808ad

Browse files
committed
Move existing ownership-related tests to their own file
1 parent dfd89f1 commit b3808ad

File tree

4 files changed

+319
-311
lines changed

4 files changed

+319
-311
lines changed

src/tests/all.rs

+24-3
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ use cargo_registry::app::App;
3131
use cargo_registry::category::NewCategory;
3232
use cargo_registry::dependency::NewDependency;
3333
use cargo_registry::keyword::Keyword;
34-
use cargo_registry::krate::{NewCrate, CrateDownload};
35-
use cargo_registry::schema::dependencies;
34+
use cargo_registry::krate::{NewCrate, CrateDownload, EncodableCrate};
35+
use cargo_registry::schema::*;
3636
use cargo_registry::upload as u;
3737
use cargo_registry::user::NewUser;
3838
use cargo_registry::owner::{CrateOwner, NewTeam, Team};
@@ -43,7 +43,6 @@ use conduit::{Request, Method};
4343
use conduit_test::MockRequest;
4444
use diesel::prelude::*;
4545
use diesel::pg::upsert::*;
46-
use cargo_registry::schema::*;
4746

4847
macro_rules! t {
4948
($e:expr) => (
@@ -89,13 +88,35 @@ mod category;
8988
mod git;
9089
mod keyword;
9190
mod krate;
91+
mod owners;
9292
mod record;
9393
mod schema_details;
9494
mod team;
9595
mod token;
9696
mod user;
9797
mod version;
9898

99+
#[derive(Deserialize)]
100+
struct GoodCrate {
101+
#[serde(rename = "crate")]
102+
krate: EncodableCrate,
103+
warnings: Warnings,
104+
}
105+
#[derive(Deserialize)]
106+
struct CrateList {
107+
crates: Vec<EncodableCrate>,
108+
meta: CrateMeta,
109+
}
110+
#[derive(Deserialize)]
111+
struct Warnings {
112+
invalid_categories: Vec<String>,
113+
invalid_badges: Vec<String>,
114+
}
115+
#[derive(Deserialize)]
116+
struct CrateMeta {
117+
total: i32,
118+
}
119+
99120
fn app() -> (record::Bomb, Arc<App>, conduit_middleware::MiddlewareBuilder) {
100121
dotenv::dotenv().ok();
101122
git::init();

0 commit comments

Comments
 (0)