1
0
mirror of https://github.com/Llewellynvdm/starship.git synced 2024-10-02 06:59:09 +00:00

revert: chore: Remove logic for the disabled option from modul… (#489)

This reverts commit 6c6e0ef1dd.
This commit is contained in:
Matan Kushner 2019-10-05 19:03:48 +09:00 committed by GitHub
parent 04512a66d9
commit f2e20bbea2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 2 deletions

View File

@ -12,6 +12,10 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
let mut module = context.new_module("memory_usage"); let mut module = context.new_module("memory_usage");
if module.config_value_bool("disabled").unwrap_or(true) {
return None;
}
let module_style = module let module_style = module
.config_value_style("style") .config_value_style("style")
.unwrap_or_else(|| Color::White.bold().dimmed()); .unwrap_or_else(|| Color::White.bold().dimmed());

View File

@ -7,6 +7,10 @@ use super::{Context, Module};
pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> { pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
let mut module = context.new_module("time"); let mut module = context.new_module("time");
if module.config_value_bool("disabled").unwrap_or(true) {
return None;
}
let module_style = module let module_style = module
.config_value_style("style") .config_value_style("style")
.unwrap_or_else(|| Color::Yellow.bold()); .unwrap_or_else(|| Color::Yellow.bold());

View File

@ -11,8 +11,13 @@ should not display when disabled, should display *something* when enabled,
and should have the correct prefixes and suffixes in a given config */ and should have the correct prefixes and suffixes in a given config */
#[test] #[test]
fn config_default() -> io::Result<()> { fn config_enabled() -> io::Result<()> {
let output = common::render_module("time").output()?; let output = common::render_module("time")
.use_config(toml::toml! {
[time]
disabled = false
})
.output()?;
let actual = String::from_utf8(output.stdout).unwrap(); let actual = String::from_utf8(output.stdout).unwrap();
// We can't test what it actually is...but we can assert it's not blank // We can't test what it actually is...but we can assert it's not blank
@ -20,11 +25,22 @@ fn config_default() -> io::Result<()> {
Ok(()) Ok(())
} }
#[test]
fn config_blank() -> io::Result<()> {
let output = common::render_module("time").output()?;
let actual = String::from_utf8(output.stdout).unwrap();
let expected = "";
assert_eq!(expected, actual);
Ok(())
}
#[test] #[test]
fn config_check_prefix_and_suffix() -> io::Result<()> { fn config_check_prefix_and_suffix() -> io::Result<()> {
let output = common::render_module("time") let output = common::render_module("time")
.use_config(toml::toml! { .use_config(toml::toml! {
[time] [time]
disabled = false
format = "[%T]" format = "[%T]"
}) })
.output()?; .output()?;