diff --git a/tests/manifest.rs b/tests/manifest.rs index d4ddce2..54f5a14 100644 --- a/tests/manifest.rs +++ b/tests/manifest.rs @@ -4,7 +4,7 @@ extern crate serde_derive; extern crate serde_json; extern crate wasm_pack; -mod utils; +mod manifest_utils; use std::fs; @@ -32,8 +32,8 @@ fn it_creates_a_package_json_default_path() { assert!(manifest::write_package_json(&path).is_ok()); let package_json_path = format!("{}/pkg/package.json", &path); assert!(fs::metadata(package_json_path).is_ok()); - assert!(utils::read_package_json(&path).is_ok()); - let pkg = utils::read_package_json(&path).unwrap(); + assert!(manifest_utils::read_package_json(&path).is_ok()); + let pkg = manifest_utils::read_package_json(&path).unwrap(); assert_eq!(pkg.name, "wasm-pack"); assert_eq!(pkg.repository.ty, "git"); assert_eq!( @@ -50,8 +50,8 @@ fn it_creates_a_package_json_provided_path() { assert!(manifest::write_package_json(&path).is_ok()); let package_json_path = format!("{}/pkg/package.json", &path); assert!(fs::metadata(package_json_path).is_ok()); - assert!(utils::read_package_json(&path).is_ok()); - let pkg = utils::read_package_json(&path).unwrap(); + assert!(manifest_utils::read_package_json(&path).is_ok()); + let pkg = manifest_utils::read_package_json(&path).unwrap(); assert_eq!(pkg.name, "js-hello-world"); assert_eq!(pkg.files, ["js_hello_world.js", "js_hello_world_bg.wasm"]); } diff --git a/tests/utils/mod.rs b/tests/manifest_utils/mod.rs similarity index 100% rename from tests/utils/mod.rs rename to tests/manifest_utils/mod.rs diff --git a/tests/readme.rs b/tests/readme.rs index 783593a..4e3b6a3 100644 --- a/tests/readme.rs +++ b/tests/readme.rs @@ -1,17 +1,32 @@ +extern crate failure; extern crate wasm_pack; +mod readme_utils; + use std::fs; use wasm_pack::readme; #[test] fn it_copies_a_readme_default_path() { - assert!(readme::copy_from_crate(".").is_ok()); - assert!(fs::metadata("./pkg/README.md").is_ok()); + let path = ".".to_string(); + assert!(readme::copy_from_crate(&path).is_ok()); + let crate_readme_path = format!("{}/README.md", &path); + let pkg_readme_path = format!("{}/pkg/README.md", &path); + assert!(fs::metadata(&pkg_readme_path).is_ok()); + let crate_readme = readme_utils::read_file(&crate_readme_path).unwrap(); + let pkg_readme = readme_utils::read_file(&pkg_readme_path).unwrap(); + assert_eq!(crate_readme, pkg_readme); } #[test] fn it_creates_a_package_json_provided_path() { - assert!(readme::copy_from_crate("./examples/js-hello-world").is_ok()); - assert!(fs::metadata("./examples/js-hello-world/pkg/README.md").is_ok()); + let path = "./examples/js-hello-world".to_string(); + assert!(readme::copy_from_crate(&path).is_ok()); + let crate_readme_path = format!("{}/README.md", &path); + let pkg_readme_path = format!("{}/pkg/README.md", &path); + assert!(fs::metadata(&pkg_readme_path).is_ok()); + let crate_readme = readme_utils::read_file(&crate_readme_path).unwrap(); + let pkg_readme = readme_utils::read_file(&pkg_readme_path).unwrap(); + assert_eq!(crate_readme, pkg_readme); } diff --git a/tests/readme_utils/mod.rs b/tests/readme_utils/mod.rs new file mode 100644 index 0000000..64f8519 --- /dev/null +++ b/tests/readme_utils/mod.rs @@ -0,0 +1,12 @@ +use std::fs::File; +use std::io::Read; + +use failure::Error; + +pub fn read_file(path: &str) -> Result { + let mut file = File::open(path)?; + let mut contents = String::new(); + file.read_to_string(&mut contents)?; + + Ok(contents) +}