Mirror/monolith
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

simplify code of CLI tests

Browse source
This commit is contained in:
Sunshine 2021-03-15 20:10:50 -10:00
parent a6ddf1c13a
commit a308a20411
No known key found for this signature in database
GPG key ID: B80CA68703CD8AB1
7 changed files with 54 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/html.rs
View file

@ -826,6 +826,7 @@ pub fn walk_and_embed_assets(
set_node_attr(node, "href", None); set_node_attr(node, "href", None);
} }
} }
if let Some(image_attr_xlink_href_value) = get_node_attr(node, "xlink:href") { if let Some(image_attr_xlink_href_value) = get_node_attr(node, "xlink:href") {
image_href = image_attr_xlink_href_value; image_href = image_attr_xlink_href_value;
if options.no_images { if options.no_images {

24
src/tests/cli/base_url.rs
View file

@ -12,8 +12,8 @@ mod passing {
use std::process::Command; use std::process::Command;
#[test] #[test]
fn add_new_when_provided() -> Result<(), Box<dyn std::error::Error>> { fn add_new_when_provided() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let out = cmd let out = cmd
.arg("-M") .arg("-M")
.arg("-b") .arg("-b")
@ -35,13 +35,11 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn keep_existing_when_none_provided() -> Result<(), Box<dyn std::error::Error>> { fn keep_existing_when_none_provided() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let out = cmd let out = cmd
.arg("-M") .arg("-M")
.arg("data:text/html,<base href=\"http://localhost:8000/\" />Hello%2C%20World!") .arg("data:text/html,<base href=\"http://localhost:8000/\" />Hello%2C%20World!")
@ -61,13 +59,11 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn override_existing_when_provided() -> Result<(), Box<dyn std::error::Error>> { fn override_existing_when_provided() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let out = cmd let out = cmd
.arg("-M") .arg("-M")
.arg("-b") .arg("-b")
@ -89,13 +85,11 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn remove_existing_when_empty_provided() -> Result<(), Box<dyn std::error::Error>> { fn remove_existing_when_empty_provided() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let out = cmd let out = cmd
.arg("-M") .arg("-M")
.arg("-b") .arg("-b")
@ -117,7 +111,5 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
} }

26
src/tests/cli/basic.rs
View file

@ -15,8 +15,8 @@ mod passing {
use url::Url; use url::Url;
#[test] #[test]
fn print_version() -> Result<(), Box<dyn std::error::Error>> { fn print_version() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let out = cmd.arg("-V").output().unwrap(); let out = cmd.arg("-V").output().unwrap();
// STDOUT should contain program name and version // STDOUT should contain program name and version
@ -30,12 +30,10 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn stdin_target_input() -> Result<(), Box<dyn std::error::Error>> { fn stdin_target_input() {
let mut echo = Command::new("echo") let mut echo = Command::new("echo")
.arg("Hello from STDIN") .arg("Hello from STDIN")
.stdout(Stdio::piped()) .stdout(Stdio::piped())
@ -44,22 +42,20 @@ mod passing {
let echo_out = echo.stdout.take().unwrap(); let echo_out = echo.stdout.take().unwrap();
echo.wait().unwrap(); echo.wait().unwrap();
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
cmd.stdin(echo_out); cmd.stdin(echo_out);
let out = cmd.arg("-M").arg("-").output().unwrap(); let out = cmd.arg("-M").arg("-").output().unwrap();
// STDOUT should contain HTML from STDIN // STDOUT should contain HTML created out of STDIN
assert_eq!( assert_eq!(
std::str::from_utf8(&out.stdout).unwrap(), std::str::from_utf8(&out.stdout).unwrap(),
"<html><head></head><body>Hello from STDIN\n</body></html>\n" "<html><head></head><body>Hello from STDIN\n</body></html>\n"
); );
Ok(())
} }
#[test] #[test]
fn css_import_string() -> Result<(), Box<dyn std::error::Error>> { fn css_import_string() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let path_html: &Path = Path::new("src/tests/data/css/index.html"); let path_html: &Path = Path::new("src/tests/data/css/index.html");
let path_css: &Path = Path::new("src/tests/data/css/style.css"); let path_css: &Path = Path::new("src/tests/data/css/style.css");
@ -95,8 +91,6 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
} }
@ -114,8 +108,8 @@ mod failing {
use std::process::Command; use std::process::Command;
#[test] #[test]
fn bad_input_empty_target() -> Result<(), Box<dyn std::error::Error>> { fn bad_input_empty_target() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let out = cmd.arg("").output().unwrap(); let out = cmd.arg("").output().unwrap();
// STDOUT should be empty // STDOUT should be empty
@ -129,7 +123,5 @@ mod failing {
// The exit code should be 1 // The exit code should be 1
out.assert().code(1); out.assert().code(1);
Ok(())
} }
} }

49
src/tests/cli/data_url.rs
View file

@ -12,8 +12,8 @@ mod passing {
use std::process::Command; use std::process::Command;
#[test] #[test]
fn bad_input_data_url() -> Result<(), Box<dyn std::error::Error>> { fn bad_input_data_url() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let out = cmd.arg("data:,Hello%2C%20World!").output().unwrap(); let out = cmd.arg("data:,Hello%2C%20World!").output().unwrap();
// STDOUT should contain HTML // STDOUT should contain HTML
@ -27,13 +27,11 @@ mod passing {
// The exit code should be 1 // The exit code should be 1
out.assert().code(1); out.assert().code(1);
Ok(())
} }
#[test] #[test]
fn isolate_data_url() -> Result<(), Box<dyn std::error::Error>> { fn isolate_data_url() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let out = cmd let out = cmd
.arg("-M") .arg("-M")
.arg("-I") .arg("-I")
@ -54,13 +52,11 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn remove_css_from_data_url() -> Result<(), Box<dyn std::error::Error>> { fn remove_css_from_data_url() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let out = cmd let out = cmd
.arg("-M") .arg("-M")
.arg("-c") .arg("-c")
@ -82,13 +78,11 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn remove_fonts_from_data_url() -> Result<(), Box<dyn std::error::Error>> { fn remove_fonts_from_data_url() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let out = cmd let out = cmd
.arg("-M") .arg("-M")
.arg("-F") .arg("-F")
@ -110,13 +104,11 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn remove_frames_from_data_url() -> Result<(), Box<dyn std::error::Error>> { fn remove_frames_from_data_url() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let out = cmd let out = cmd
.arg("-M") .arg("-M")
.arg("-f") .arg("-f")
@ -137,13 +129,11 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn remove_images_from_data_url() -> Result<(), Box<dyn std::error::Error>> { fn remove_images_from_data_url() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let out = cmd let out = cmd
.arg("-M") .arg("-M")
.arg("-i") .arg("-i")
@ -173,13 +163,11 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn remove_js_from_data_url() -> Result<(), Box<dyn std::error::Error>> { fn remove_js_from_data_url() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let out = cmd let out = cmd
.arg("-M") .arg("-M")
.arg("-j") .arg("-j")
@ -203,14 +191,11 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn security_disallow_local_assets_within_data_url_targets( fn security_disallow_local_assets_within_data_url_targets() {
) -> Result<(), Box<dyn std::error::Error>> { let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
let out = cmd let out = cmd
.arg("-M") .arg("-M")
.arg("data:text/html,%3Cscript%20src=\"src/tests/data/basic/local-script.js\"%3E%3C/script%3E") .arg("data:text/html,%3Cscript%20src=\"src/tests/data/basic/local-script.js\"%3E%3C/script%3E")
@ -228,7 +213,5 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
} }

31
src/tests/cli/local_files.rs
View file

@ -15,8 +15,8 @@ mod passing {
use url::Url; use url::Url;
#[test] #[test]
fn local_file_target_input_relative_target_path() -> Result<(), Box<dyn std::error::Error>> { fn local_file_target_input_relative_target_path() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let cwd_normalized: String = let cwd_normalized: String =
str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/"); str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
let out = cmd let out = cmd
@ -65,13 +65,11 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn local_file_target_input_absolute_target_path() -> Result<(), Box<dyn std::error::Error>> { fn local_file_target_input_absolute_target_path() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let path_html: &Path = Path::new("src/tests/data/basic/local-file.html"); let path_html: &Path = Path::new("src/tests/data/basic/local-file.html");
let out = cmd let out = cmd
@ -115,13 +113,11 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn local_file_url_target_input() -> Result<(), Box<dyn std::error::Error>> { fn local_file_url_target_input() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let cwd_normalized: String = let cwd_normalized: String =
str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/"); str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" }; let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
@ -177,14 +173,11 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn embed_file_url_local_asset_within_style_attribute() -> Result<(), Box<dyn std::error::Error>> fn embed_file_url_local_asset_within_style_attribute() {
{ let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
let path_html: &Path = Path::new("src/tests/data/svg/index.html"); let path_html: &Path = Path::new("src/tests/data/svg/index.html");
let path_svg: &Path = Path::new("src/tests/data/svg/image.svg"); let path_svg: &Path = Path::new("src/tests/data/svg/image.svg");
@ -215,13 +208,11 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn discard_integrity_for_local_files() -> Result<(), Box<dyn std::error::Error>> { fn discard_integrity_for_local_files() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let cwd_normalized: String = let cwd_normalized: String =
str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/"); str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" }; let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
@ -280,7 +271,5 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
} }

24
src/tests/cli/noscript.rs
View file

@ -15,8 +15,8 @@ mod passing {
use url::Url; use url::Url;
#[test] #[test]
fn parse_noscript_contents() -> Result<(), Box<dyn std::error::Error>> { fn parse_noscript_contents() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let path_html: &Path = Path::new("src/tests/data/noscript/index.html"); let path_html: &Path = Path::new("src/tests/data/noscript/index.html");
let path_svg: &Path = Path::new("src/tests/data/noscript/image.svg"); let path_svg: &Path = Path::new("src/tests/data/noscript/image.svg");
@ -47,13 +47,11 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn unwrap_noscript_contents() -> Result<(), Box<dyn std::error::Error>> { fn unwrap_noscript_contents() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let path_html: &Path = Path::new("src/tests/data/noscript/index.html"); let path_html: &Path = Path::new("src/tests/data/noscript/index.html");
let path_svg: &Path = Path::new("src/tests/data/noscript/image.svg"); let path_svg: &Path = Path::new("src/tests/data/noscript/image.svg");
@ -84,13 +82,11 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn unwrap_noscript_contents_nested() -> Result<(), Box<dyn std::error::Error>> { fn unwrap_noscript_contents_nested() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let path_html: &Path = Path::new("src/tests/data/noscript/nested.html"); let path_html: &Path = Path::new("src/tests/data/noscript/nested.html");
let path_svg: &Path = Path::new("src/tests/data/noscript/image.svg"); let path_svg: &Path = Path::new("src/tests/data/noscript/image.svg");
@ -121,13 +117,11 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
#[test] #[test]
fn unwrap_noscript_contents_with_script() -> Result<(), Box<dyn std::error::Error>> { fn unwrap_noscript_contents_with_script() {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let path_html: &Path = Path::new("src/tests/data/noscript/script.html"); let path_html: &Path = Path::new("src/tests/data/noscript/script.html");
let path_svg: &Path = Path::new("src/tests/data/noscript/image.svg"); let path_svg: &Path = Path::new("src/tests/data/noscript/image.svg");
@ -158,7 +152,5 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
} }

6
src/tests/cli/unusual_encodings.rs
View file

@ -12,10 +12,10 @@ mod passing {
use std::process::Command; use std::process::Command;
#[test] #[test]
fn change_encoding_to_utf_8() -> Result<(), Box<dyn std::error::Error>> { fn change_encoding_to_utf_8() {
let cwd = env::current_dir().unwrap(); let cwd = env::current_dir().unwrap();
let cwd_normalized: String = str!(cwd.to_str().unwrap()).replace("\\", "/"); let cwd_normalized: String = str!(cwd.to_str().unwrap()).replace("\\", "/");
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?; let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
let out = cmd let out = cmd
.arg("-M") .arg("-M")
.arg(if cfg!(windows) { .arg(if cfg!(windows) {
@ -45,7 +45,5 @@ mod passing {
// The exit code should be 0 // The exit code should be 0
out.assert().code(0); out.assert().code(0);
Ok(())
} }
} }