selfhosted
/
rustypaste
mirror of https://github.com/orhun/rustypaste.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use `expect` in tests, rather than `unwrap`

This commit is contained in:
Jake Howard 2024-02-28 18:11:38 +00:00
parent 0f83176b5f
commit 90646b4cd0
No known key found for this signature in database
GPG Key ID: 57AFB45680EDD477
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/paste.rs
View File

@ -449,7 +449,11 @@ mod tests {
fs::remove_file(file_name)?;
for paste_type in &[PasteType::Url, PasteType::Oneshot] {
fs::create_dir_all(paste_type.get_path(&config.server.upload_path).unwrap())?;
fs::create_dir_all(
paste_type
.get_path(&config.server.upload_path)
.expect("Bad upload path"),
)?;
}
config.paste.random_url = None;
@ -461,7 +465,7 @@ mod tests {
let file_name = paste.store_file("test.file", Some(expiry_date), None, &config)?;
let file_path = PasteType::Oneshot
.get_path(&config.server.upload_path)
.unwrap()
.expect("Bad upload path")
.join(format!("{file_name}.{expiry_date}"));
assert_eq!("test", fs::read_to_string(&file_path)?);
fs::remove_file(file_path)?;
@ -478,7 +482,7 @@ mod tests {
let file_name = paste.store_url(None, &config)?;
let file_path = PasteType::Url
.get_path(&config.server.upload_path)
.unwrap()
.expect("Bad upload path")
.join(&file_name);
assert_eq!(url, fs::read_to_string(&file_path)?);
fs::remove_file(file_path)?;
@ -506,7 +510,7 @@ mod tests {
.await?;
let file_path = PasteType::RemoteFile
.get_path(&config.server.upload_path)
.unwrap()
.expect("Bad upload path")
.join(file_name);
assert_eq!(
"8c712905b799905357b8202d0cb7a244cefeeccf7aa5eb79896645ac50158ffa",
@ -515,7 +519,11 @@ mod tests {
fs::remove_file(file_path)?;
for paste_type in &[PasteType::Url, PasteType::Oneshot] {
fs::remove_dir(paste_type.get_path(&config.server.upload_path).unwrap())?;
fs::remove_dir(
paste_type
.get_path(&config.server.upload_path)
.expect("Bad upload path"),
)?;
}
Ok(())

8
src/server.rs
View File

@ -1095,7 +1095,9 @@ mod tests {
)
.await;
let url_upload_path = PasteType::Url.get_path(&config.server.upload_path).unwrap();
let url_upload_path = PasteType::Url
.get_path(&config.server.upload_path)
.expect("Bad upload path");
fs::create_dir_all(&url_upload_path)?;
let response = test::call_service(
@ -1135,7 +1137,7 @@ mod tests {
let oneshot_upload_path = PasteType::Oneshot
.get_path(&config.server.upload_path)
.unwrap();
.expect("Bad upload path");
fs::create_dir_all(&oneshot_upload_path)?;
let file_name = "oneshot.txt";
@ -1197,7 +1199,7 @@ mod tests {
let url_upload_path = PasteType::OneshotUrl
.get_path(&config.server.upload_path)
.unwrap();
.expect("Bad upload path");
fs::create_dir_all(&url_upload_path)?;
let response = test::call_service(