foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

fix(coverage): handle ignore patterns (#23974)

Browse source 
closes #23972
This commit is contained in:
Yoshiya Hinosawa 2024-05-28 12:37:30 +09:00 committed by GitHub
parent c4211e2ffc
commit d99c6c1ea4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 54 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cli/tools/coverage/mod.rs
View file

@ -397,11 +397,7 @@ fn collect_coverages(
)?
}
}),
exclude: PathOrPatternSet::from_exclude_relative_path_or_patterns(
initial_cwd,
&files.ignore,
)
.context("Invalid ignore pattern.")?,
exclude: PathOrPatternSet::new(vec![]),
};
let file_paths = FileCollector::new(|e| {
e.path.extension().map(|ext| ext == "json").unwrap_or(false)
@ -411,12 +407,28 @@ fn collect_coverages(
.set_vendor_folder(cli_options.vendor_dir_path().map(ToOwned::to_owned))
.collect_file_patterns(file_patterns)?;
let coverage_patterns = FilePatterns {
base: initial_cwd.to_path_buf(),
include: None,
exclude: PathOrPatternSet::from_exclude_relative_path_or_patterns(
initial_cwd,
&files.ignore,
)
.context("Invalid ignore pattern.")?,
};
for file_path in file_paths {
let new_coverage = fs::read_to_string(file_path.as_path())
.map_err(AnyError::from)
.and_then(|json| serde_json::from_str(&json).map_err(AnyError::from))
.and_then(|json| {
serde_json::from_str::<cdp::ScriptCoverage>(&json)
.map_err(AnyError::from)
})
.with_context(|| format!("Failed reading '{}'", file_path.display()))?;
coverages.push(new_coverage);
let url = Url::parse(&new_coverage.url)?;
if coverage_patterns.matches_specifier(&url) {
coverages.push(new_coverage);
}
}
coverages.sort_by_key(|k| k.url.clone());

43
tests/integration/coverage_tests.rs
View file

@ -547,14 +547,15 @@ fn test_summary_reporter() {
output.assert_exit_code(0);
output.skip_output_check();
let output = context
.new_command()
.args_vec(vec!["coverage".to_string(), format!("{}/", tempdir)])
.run();
{
let output = context
.new_command()
.args_vec(vec!["coverage".to_string(), format!("{}/", tempdir)])
.run();
output.assert_exit_code(0);
output.assert_matches_text(
"----------------------------------
output.assert_exit_code(0);
output.assert_matches_text(
"----------------------------------
File | Branch % | Line % |
----------------------------------
bar.ts | 0.0 | 57.1 |
@ -565,7 +566,33 @@ File | Branch % | Line % |
All files | 40.0 | 61.0 |
----------------------------------
",
);
);
}
// test --ignore flag works
{
let output = context
.new_command()
.args_vec(vec![
"coverage".to_string(),
format!("{}/", tempdir),
"--ignore=**/bar.ts,**/quux.ts".to_string(),
])
.run();
output.assert_exit_code(0);
output.assert_matches_text(
"---------------------------------
File | Branch % | Line % |
---------------------------------
baz/qux.ts | 100.0 | 100.0 |
foo.ts | 50.0 | 76.9 |
---------------------------------
All files | 66.7 | 85.0 |
---------------------------------
",
);
}
}
#[test]