From fb7853fbcdeb02bc98b4c9e3ddaaa68e418b59a5 Mon Sep 17 00:00:00 2001 From: Aaron Weiss Date: Tue, 13 Jan 2015 03:01:18 -0500 Subject: [PATCH] Changed config.json to client_config.json. --- mktestconfig.sh | 2 +- src/client/data/config.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mktestconfig.sh b/mktestconfig.sh index 072c1ee..62478bd 100755 --- a/mktestconfig.sh +++ b/mktestconfig.sh @@ -1 +1 @@ -echo "{\"owners\": [\"test\"],\"nickname\": \"test\",\"username\": \"test\",\"realname\": \"test\",\"password\": \"\",\"server\": \"irc.test.net\",\"port\": 6667,\"use_ssl\": false,\"encoding\": \"UTF-8\",\"channels\": [\"#test\", \"#test2\"],\"options\": {}}" > config.json +echo "{\"owners\": [\"test\"],\"nickname\": \"test\",\"username\": \"test\",\"realname\": \"test\",\"password\": \"\",\"server\": \"irc.test.net\",\"port\": 6667,\"use_ssl\": false,\"encoding\": \"UTF-8\",\"channels\": [\"#test\", \"#test2\"],\"options\": {}}" > client_config.json diff --git a/src/client/data/config.rs b/src/client/data/config.rs index 0c0800d..46d366c 100644 --- a/src/client/data/config.rs +++ b/src/client/data/config.rs @@ -190,7 +190,7 @@ mod test { user_info: None, options: Some(HashMap::new()), }; - assert_eq!(Config::load(Path::new("config.json")), Ok(cfg)); + assert_eq!(Config::load(Path::new("client_config.json")), Ok(cfg)); } #[test] @@ -211,7 +211,7 @@ mod test { user_info: None, options: Some(HashMap::new()), }; - assert_eq!(Config::load_utf8("config.json"), Ok(cfg)); + assert_eq!(Config::load_utf8("client_config.json"), Ok(cfg)); }