diff --git a/src/lib.rs b/src/lib.rs
index 559fab95..ac63e2a1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -46,7 +46,6 @@ use {
display_secret::DisplaySecret,
entries::Entries,
entry::Entry,
- entry_type::EntryType,
envelope::Envelope,
file::File,
format::Format,
@@ -149,10 +148,11 @@ use {
};
pub use self::{
- directory_tree::DirectoryTree, encode::Encode, encoder::Encoder, error::Error,
- fingerprint::Fingerprint, hash::Hash, language_error::LanguageError, major_type::MajorType,
- manifest::Manifest, map_encoder::MapEncoder, private_key::PrivateKey, public_key::PublicKey,
- relative_path::RelativePath, signature::Signature, statement::Statement, tag_error::TagError,
+ directory_tree::DirectoryTree, encode::Encode, encoder::Encoder, entry_type::EntryType,
+ error::Error, fingerprint::Fingerprint, hash::Hash, language_error::LanguageError,
+ major_type::MajorType, manifest::Manifest, map_encoder::MapEncoder, private_key::PrivateKey,
+ public_key::PublicKey, relative_path::RelativePath, signature::Signature, statement::Statement,
+ tag_error::TagError,
};
#[cfg(test)]
diff --git a/templates/directory.html b/templates/directory.html
index 5b1091d2..90ca2815 100644
--- a/templates/directory.html
+++ b/templates/directory.html
@@ -12,7 +12,7 @@
Directory {{ self.hash }}
%% for (name, entry) in &self.directory.entries {
%% match entry.ty {
%% EntryType::Directory => {
- {{ name }}
+ {{ name }}/
%% }
%% EntryType::File => {
{{ name }}
diff --git a/tests/lib.rs b/tests/lib.rs
index ab048e2b..8599f125 100644
--- a/tests/lib.rs
+++ b/tests/lib.rs
@@ -1,7 +1,7 @@
use {
self::{child::Child, expected::Expected, test::Test},
camino::{Utf8Path, Utf8PathBuf},
- filepack::{Encoder, Hash, Manifest, PrivateKey, PublicKey, assert_matches},
+ filepack::{Encoder, EntryType, Hash, Manifest, PrivateKey, PublicKey, assert_matches},
regex::Regex,
reqwest::StatusCode,
std::{
diff --git a/tests/upload.rs b/tests/upload.rs
index d211543c..eda2aa1c 100644
--- a/tests/upload.rs
+++ b/tests/upload.rs
@@ -483,13 +483,17 @@ fn upload_package_uploads_files() {
let body = response.text().unwrap();
- for (name, kind) in [
- ("bar", "file"),
- ("empty", "directory"),
- ("foo", "file"),
- ("sub", "directory"),
+ for (name, ty) in [
+ ("bar", EntryType::File),
+ ("empty", EntryType::Directory),
+ ("foo", EntryType::File),
+ ("sub", EntryType::Directory),
] {
- let pattern = format!(r"{name}");
+ let pattern = match ty {
+ EntryType::Directory => format!(r"{name}/"),
+ EntryType::File => format!(r"{name}"),
+ };
+
assert!(
Regex::new(&pattern).unwrap().is_match(&body),
"body missing `{name}`: {body}"