Skip to content

tests/krate/publish: Use assert_eq!() to check response payload content #3066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 30 additions & 12 deletions src/controllers/krate/publish.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ use crate::render;
use crate::util::{read_fill, read_le_u32, Maximums};
use crate::views::{EncodableCrateUpload, GoodCrate, PublishWarnings};

pub const MISSING_RIGHTS_ERROR_MESSAGE: &str =
"this crate exists but you don't seem to be an owner. \
If you believe this is a mistake, perhaps you need \
to accept an invitation to be an owner before \
publishing.";

/// Handles the `PUT /crates/new` route.
/// Used by `cargo publish` to publish a new crate or to publish a new version of an
/// existing crate.
Expand Down Expand Up @@ -98,12 +104,7 @@ pub fn publish(req: &mut dyn RequestExt) -> EndpointResult {

let owners = krate.owners(&conn)?;
if user.rights(req.app(), &owners)? < Rights::Publish {
return Err(cargo_err(
"this crate exists but you don't seem to be an owner. \
If you believe this is a mistake, perhaps you need \
to accept an invitation to be an owner before \
publishing.",
));
return Err(cargo_err(MISSING_RIGHTS_ERROR_MESSAGE));
}

if krate.name != *name {
Expand Down Expand Up @@ -260,13 +261,30 @@ fn parse_new_headers(req: &mut dyn RequestExt) -> AppResult<EncodableCrateUpload
missing.push("authors");
}
if !missing.is_empty() {
return Err(cargo_err(&format_args!(
"missing or empty metadata fields: {}. Please \
see https://doc.rust-lang.org/cargo/reference/manifest.html for \
how to upload metadata",
missing.join(", ")
)));
let message = missing_metadata_error_message(&missing);
return Err(cargo_err(&message));
}

Ok(new)
}

pub fn missing_metadata_error_message(missing: &[&str]) -> String {
format!(
"missing or empty metadata fields: {}. Please \
see https://doc.rust-lang.org/cargo/reference/manifest.html for \
how to upload metadata",
missing.join(", ")
)
}

#[cfg(test)]
mod tests {
use super::missing_metadata_error_message;

#[test]
fn missing_metadata_error_message_test() {
assert_eq!(missing_metadata_error_message(&["a"]), "missing or empty metadata fields: a. Please see https://doc.rust-lang.org/cargo/reference/manifest.html for how to upload metadata");
assert_eq!(missing_metadata_error_message(&["a", "b"]), "missing or empty metadata fields: a, b. Please see https://doc.rust-lang.org/cargo/reference/manifest.html for how to upload metadata");
assert_eq!(missing_metadata_error_message(&["a", "b", "c"]), "missing or empty metadata fields: a, b, c. Please see https://doc.rust-lang.org/cargo/reference/manifest.html for how to upload metadata");
}
}
12 changes: 6 additions & 6 deletions src/models/dependency.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ use crate::models::{Crate, Version};
use crate::schema::*;
use crate::views::{EncodableCrateDependency, EncodableDependency};

pub const WILDCARD_ERROR_MESSAGE: &str = "wildcard (`*`) dependency constraints are not allowed \
on crates.io. See https://doc.rust-lang.org/cargo/faq.html#can-\
libraries-use--as-a-version-for-their-dependencies for more \
information";

#[derive(Identifiable, Associations, Debug, Queryable, QueryableByName)]
#[belongs_to(Version)]
#[belongs_to(Crate)]
Expand Down Expand Up @@ -91,12 +96,7 @@ pub fn add_dependencies(
.first(&*conn)
.map_err(|_| cargo_err(&format_args!("no known crate named `{}`", &*dep.name)))?;
if dep.version_req == semver::VersionReq::parse("*").unwrap() {
return Err(cargo_err(
"wildcard (`*`) dependency constraints are not allowed \
on crates.io. See https://doc.rust-lang.org/cargo/faq.html#can-\
libraries-use--as-a-version-for-their-dependencies for more \
information",
));
return Err(cargo_err(WILDCARD_ERROR_MESSAGE));
}

// If this dependency has an explicit name in `Cargo.toml` that
Expand Down
Loading