-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add test for systemwide config file support
There is now a new stage in the CICD workflow present, which will build `bat` with the `BAT_SYSTEM_CONFIG_PREFIX` set to load the config file from `/tests/examples/system_config/bat/config`, plus a basic set of tests, to ensure the feature is working as expected. By default the tests are set to ignored, as they need special setup before they can be run.
- Loading branch information
Patrick Pichler
committed
Nov 28, 2021
1 parent
8afc9a8
commit 6d69225
Showing
7 changed files
with
97 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# Make sure that the pager gets executed | ||
--paging=always | ||
|
||
# Output a dummy message for the integration test. | ||
# Output a dummy message for the integration test and system wide config test. | ||
--pager="echo dummy-pager-from-config" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# Make sure that the pager gets executed | ||
--paging=always | ||
|
||
# Output a dummy message for the integration test. | ||
--pager="echo dummy-pager-from-system-config" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
use predicates::{prelude::predicate, str::PredicateStrExt}; | ||
|
||
mod utils; | ||
use utils::command::bat_with_config; | ||
|
||
// This test is ignored, as it needs a special system wide config put into place. | ||
// In order to run this tests, use `cargo test --test system_wide_config -- --ignored` | ||
#[test] | ||
#[ignore] | ||
fn use_systemwide_config() { | ||
bat_with_config() | ||
.arg("test.txt") | ||
.assert() | ||
.success() | ||
.stdout(predicate::eq("dummy-pager-from-system-config\n").normalize()); | ||
} | ||
|
||
// This test is ignored, as it needs a special system wide config put into place | ||
// In order to run this tests, use `cargo test --test system_wide_config -- --ignored` | ||
#[test] | ||
#[ignore] | ||
fn config_overrides_system_config() { | ||
bat_with_config() | ||
.env("BAT_CONFIG_PATH", "bat.conf") | ||
.arg("test.txt") | ||
.assert() | ||
.success() | ||
.stdout(predicate::eq("dummy-pager-from-config\n").normalize()); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
use assert_cmd::cargo::CommandCargoExt; | ||
use std::process::Command; | ||
|
||
pub fn bat_raw_command_with_config() -> Command { | ||
let mut cmd = Command::cargo_bin("bat").unwrap(); | ||
cmd.current_dir("tests/examples"); | ||
cmd.env_remove("BAT_CACHE_PATH"); | ||
cmd.env_remove("BAT_CONFIG_DIR"); | ||
cmd.env_remove("BAT_CONFIG_PATH"); | ||
cmd.env_remove("BAT_OPTS"); | ||
cmd.env_remove("BAT_PAGER"); | ||
cmd.env_remove("BAT_STYLE"); | ||
cmd.env_remove("BAT_TABS"); | ||
cmd.env_remove("BAT_THEME"); | ||
cmd.env_remove("COLORTERM"); | ||
cmd.env_remove("NO_COLOR"); | ||
cmd.env_remove("PAGER"); | ||
cmd | ||
} | ||
|
||
pub fn bat_raw_command() -> Command { | ||
let mut cmd = bat_raw_command_with_config(); | ||
cmd.arg("--no-config"); | ||
cmd | ||
} | ||
|
||
pub fn bat_with_config() -> assert_cmd::Command { | ||
assert_cmd::Command::from_std(bat_raw_command_with_config()) | ||
} | ||
|
||
pub fn bat() -> assert_cmd::Command { | ||
assert_cmd::Command::from_std(bat_raw_command()) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
pub mod command; | ||
pub mod mocked_pagers; |