Skip to content

Fixed: incorrect get entry behaviour #105

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.

Sign up for GitHub

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

Open
zerodegress wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed: incorrect get entry behaviour #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e14ee9
Fixed: Incorrect 'get_entry 'behaviour.
zerodegress Jul 5, 2024
d3cfc1c
Added: Test if 'get_entry' works properly.
zerodegress Jul 5, 2024
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
2 changes: 1 addition & 1 deletion include_dir/src/dir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ impl<'a> Dir<'a> {
let path = path.as_ref();

for entry in self.entries() {
if entry.path() == path {
if entry.path() == self.path().join(path) {
return Some(entry);
}

Expand Down
8 changes: 8 additions & 0 deletions include_dir/tests/integration_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ fn extract_all_files() {
validate_extracted(&PARENT_DIR, root);
}

#[test]
fn get_entry_works_properly() {
PARENT_DIR.get_dir("src")
.expect("is 'src' deleted? please fix this.")
.get_entry("lib.rs")
.expect("check if 'lib.rs' exists, or the behaviour is not expected.");
}

// Validates that all files on the filesystem exist in the inclusion
fn validate_included(dir: &Dir<'_>, path: &Path, root: &Path) {
for entry in path.read_dir().unwrap() {
Expand Down