fix(tests): dont take &CliArgs

Author: 0x61nas

src/keys/key_config.rs

@@ -2,10 +2,7 @@ use anyhow::{anyhow, Result};
 use crossterm::event::{KeyCode, KeyModifiers};
 use std::{fs::canonicalize, path::PathBuf, rc::Rc};
 
-use crate::{
-	args::{get_app_config_path, CliArgs},
-	strings::symbol,
-};
+use crate::{args::get_app_config_path, strings::symbol};
 
 use super::{
 	key_list::{GituiKeyEvent, KeysList},
@@ -37,8 +34,11 @@ impl KeyConfig {
 			.map_or_else(|_| Ok(symbols_file), Ok)
 	}
 
-	pub fn init(cli_args: &CliArgs) -> Result<Self> {
-		let keys = if let Some(path) = &cli_args.key_bindings_path {
+	pub fn init(
+		key_bindings_path: Option<&PathBuf>,
+		key_symbols_path: Option<&PathBuf>,
+	) -> Result<Self> {
+		let keys = if let Some(path) = key_bindings_path {
 			if !path.exists() {
 				return Err(anyhow!(
 					"The custom key bindings file dosen't exists"
@@ -49,7 +49,7 @@ impl KeyConfig {
 			KeysList::init(Self::get_config_file()?)
 		};
 
-		let symbols = if let Some(path) = &cli_args.key_symbols_path {
+		let symbols = if let Some(path) = key_symbols_path {
 			if !path.exists() {
 				return Err(anyhow!(
 					"The custom key symbols file dosen't exists"
@@ -216,7 +216,7 @@ mod tests {
 
 		// testing
 		let result = std::panic::catch_unwind(|| {
-			let loaded_config = KeyConfig::init().unwrap();
+			let loaded_config = KeyConfig::init(None, None).unwrap();
 			assert_eq!(
 				loaded_config.keys.move_down,
 				KeysList::default().move_down
@@ -231,7 +231,7 @@ mod tests {
 				&original_key_symbols_path,
 			)
 			.unwrap();
-			let loaded_config = KeyConfig::init().unwrap();
+			let loaded_config = KeyConfig::init(None, None).unwrap();
 			assert_eq!(
 				loaded_config.keys.move_down,
 				KeysList::default().move_down
@@ -243,7 +243,7 @@ mod tests {
 				&original_key_list_path,
 			)
 			.unwrap();
-			let loaded_config = KeyConfig::init().unwrap();
+			let loaded_config = KeyConfig::init(None, None).unwrap();
 			assert_eq!(
 				loaded_config.keys.move_down,
 				GituiKeyEvent::new(
@@ -254,7 +254,7 @@ mod tests {
 			assert_eq!(loaded_config.symbols.esc, "Esc");
 
 			fs::remove_file(&original_key_symbols_path).unwrap();
-			let loaded_config = KeyConfig::init().unwrap();
+			let loaded_config = KeyConfig::init(None, None).unwrap();
 			assert_eq!(
 				loaded_config.keys.move_down,
 				GituiKeyEvent::new(

src/main.rs

@@ -166,9 +166,12 @@ fn main() -> Result<()> {
 	asyncgit::register_tracing_logging();
 	ensure_valid_path(&cliargs.repo_path)?;
 
-	let key_config = KeyConfig::init(&cliargs)
-		.map_err(|e| log_eprintln!("KeyConfig loading error: {e}"))
-		.unwrap_or_default();
+	let key_config = KeyConfig::init(
+		cliargs.key_bindings_path.as_ref(),
+		cliargs.key_symbols_path.as_ref(),
+	)
+	.map_err(|e| log_eprintln!("KeyConfig loading error: {e}"))
+	.unwrap_or_default();
 	let theme = Theme::init(&cliargs.theme);
 
 	setup_terminal()?;