Merge pull request #59 from steveklabnik/improve-test-layout

Improve test layout

tests/manifest/main.rs

@@ -4,7 +4,7 @@ extern crate serde_derive;
 extern crate serde_json;
 extern crate wasm_pack;
 
-mod manifest_utils;
+mod 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!(manifest_utils::read_package_json(&path).is_ok());
-    let pkg = manifest_utils::read_package_json(&path).unwrap();
+    assert!(utils::read_package_json(&path).is_ok());
+    let pkg = 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!(manifest_utils::read_package_json(&path).is_ok());
-    let pkg = manifest_utils::read_package_json(&path).unwrap();
+    assert!(utils::read_package_json(&path).is_ok());
+    let pkg = 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"]);
 }

tests/readme/main.rs

@@ -1,7 +1,7 @@
 extern crate failure;
 extern crate wasm_pack;
 
-mod readme_utils;
+mod utils;
 
 use std::fs;
 
@@ -14,8 +14,8 @@ fn it_copies_a_readme_default_path() {
     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();
+    let crate_readme = utils::read_file(&crate_readme_path).unwrap();
+    let pkg_readme = utils::read_file(&pkg_readme_path).unwrap();
     assert_eq!(crate_readme, pkg_readme);
 }
 
@@ -26,7 +26,7 @@ fn it_creates_a_package_json_provided_path() {
     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();
+    let crate_readme = utils::read_file(&crate_readme_path).unwrap();
+    let pkg_readme = utils::read_file(&pkg_readme_path).unwrap();
     assert_eq!(crate_readme, pkg_readme);
 }