refactor: run tests as integration test (#17)

* refactor: run tests as integration test

* chore: Lint

* chore: Revert unit test move

---------

Co-authored-by: Dustin Blackman <[email protected]>

src/binary.rs

@@ -14,10 +14,6 @@ use which::which;
 use crate::cargo_config;
 use crate::metadata;
 
-#[cfg(test)]
-#[path = "binary_test.rs"]
-mod binary_test;
-
 pub fn cargo_install(
     binary_package: metadata::BinaryPackage,
     cache_path: path::PathBuf,

src/cargo_config.rs

@@ -8,10 +8,6 @@ use toml_edit::Document;
 
 use crate::metadata;
 
-#[cfg(test)]
-#[path = "cargo_config_test.rs"]
-mod cargo_config_test;
-
 pub fn sync_aliases() -> Result<()> {
     let mut toml_str = "".to_string();
     let config_path = metadata::get_project_root()?.join(".cargo/config.toml");

src/cli.rs

@@ -12,10 +12,6 @@ use crate::cargo_config;
 use crate::metadata;
 use crate::shims;
 
-#[cfg(test)]
-#[path = "cli_integration_test.rs"]
-mod cli_integration_test;
-
 fn install_all_binaries() -> Result<()> {
     let binary_packages = metadata::get_binary_packages()?;
     for binary_package in binary_packages {

src/lib.rs

@@ -0,0 +1,8 @@
+#![deny(clippy::implicit_return)]
+#![allow(clippy::needless_return)]
+
+pub mod binary;
+pub mod cargo_config;
+pub mod cli;
+pub mod metadata;
+pub mod shims;

src/main.rs

@@ -1,18 +1,9 @@
-#![deny(clippy::implicit_return)]
-#![allow(clippy::needless_return)]
-
 use std::process;
 
 use owo_colors::OwoColorize;
 
-mod binary;
-mod cargo_config;
-mod cli;
-mod metadata;
-mod shims;
-
 fn main() {
-    let res = cli::run();
+    let res = cargo_run_bin::cli::run();
 
     // Only reached if run-bin code fails, otherwise process exits early from within
     // binary::run.

src/metadata_test.rs

@@ -1,14 +1,14 @@
-use super::*;
+use super::get_binary_packages;
 
 mod get_binary_packages {
     use super::*;
 
     #[test]
     fn it_returns_locked_packages() {
         let binary_packages = get_binary_packages().unwrap();
-        let nextest = binary_packages.iter().find(|&e| {
-            return e.package == "cargo-nextest";
-        });
+        let nextest = binary_packages
+            .iter()
+            .find(|&e| return e.package == "cargo-nextest");
 
         assert!(nextest.is_some());
         let res = nextest.unwrap();

src/shims.rs

@@ -8,10 +8,6 @@ use cfg_if::cfg_if;
 
 use crate::metadata;
 
-#[cfg(test)]
-#[path = "shims_test.rs"]
-mod shims_test;
-
 #[cfg(target_family = "unix")]
 fn create_shim(binary: &str, bin_path: path::PathBuf) -> Result<()> {
     use std::os::unix::prelude::OpenOptionsExt;

src/binary_test.rs → tests/binary_test.rs

@@ -1,19 +1,14 @@
-use cfg_if::cfg_if;
-
-use super::*;
-
 mod install {
-    use super::*;
-    use crate::metadata;
+    use cargo_run_bin::binary::install;
+    use cargo_run_bin::metadata;
+    use cfg_if::cfg_if;
 
     #[test]
     fn it_returns_bin_path() {
         let binary_packages = metadata::get_binary_packages().unwrap();
         let nextest = binary_packages
             .iter()
-            .find(|&e| {
-                return e.package == "cargo-nextest";
-            })
+            .find(|&e| e.package == "cargo-nextest")
             .unwrap();
 
         let cache_bin_path = install(nextest.clone()).unwrap();
@@ -29,7 +24,8 @@ mod install {
 }
 
 mod cargo_install {
-    use super::*;
+    use cargo_run_bin::binary::cargo_install;
+    use cargo_run_bin::metadata;
 
     #[test]
     fn it_builds_successfully() {
@@ -165,7 +161,8 @@ mod cargo_install {
 }
 
 mod binstall {
-    use super::*;
+    use cargo_run_bin::binary::binstall;
+    use cargo_run_bin::metadata;
 
     #[test]
     fn it_builds_successfully() {
@@ -213,17 +210,16 @@ mod binstall {
 }
 
 mod run {
-    use super::*;
-    use crate::metadata;
+    use cargo_run_bin::binary::install;
+    use cargo_run_bin::binary::run;
+    use cargo_run_bin::metadata;
 
     #[test]
     fn it_runs_help_successfully() {
         let binary_packages = metadata::get_binary_packages().unwrap();
         let nextest = binary_packages
             .iter()
-            .find(|&e| {
-                return e.package == "cargo-nextest";
-            })
+            .find(|&e| e.package == "cargo-nextest")
             .unwrap();
         let cache_bin_path = install(nextest.clone()).unwrap();
 

src/cargo_config_test.rs → tests/cargo_config_test.rs

@@ -1,9 +1,7 @@
-use std::fs;
-
-use super::*;
-
 mod sync_aliases {
-    use super::*;
+    use std::fs;
+
+    use cargo_run_bin::cargo_config::sync_aliases;
 
     #[test]
     fn it_removes_and_adds_aliases() {
@@ -19,7 +17,7 @@ mod sync_aliases {
 }
 
 mod binstall_alias_exists {
-    use super::*;
+    use cargo_run_bin::cargo_config::binstall_alias_exists;
 
     // Lazy happy path test.
     #[test]

src/cli_integration_test.rs → tests/cli_integration_test.rs

@@ -1,18 +1,18 @@
-use assert_cmd::Command;
-
-use crate::metadata;
+use cargo_run_bin::metadata;
 
 fn get_bin() -> String {
     return metadata::get_project_root()
         .unwrap()
-        .join("target/debug/cargo-bin")
+        .join(env!("CARGO_BIN_EXE_cargo-bin").replace(".exe", ""))
         .to_str()
         .unwrap()
         .to_string();
 }
 
 mod direct {
-    use super::*;
+    use assert_cmd::Command;
+
+    use super::get_bin;
 
     #[test]
     fn it_syncs_aliases_successfully() {
@@ -84,7 +84,9 @@ mod direct {
 }
 
 mod bin_prefix {
-    use super::*;
+    use assert_cmd::Command;
+
+    use super::get_bin;
 
     #[test]
     fn it_syncs_aliases_successfully() {

src/shims_test.rs → tests/shims_test.rs

@@ -1,8 +1,6 @@
-use super::*;
-
 mod sync_shims {
-    use super::super::metadata;
-    use super::*;
+    use cargo_run_bin::metadata;
+    use cargo_run_bin::shims::sync;
 
     #[test]
     #[cfg(target_family = "unix")]