Skip to content

Make tests pass on small terminal width #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
socksy wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Make tests pass on small terminal width #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions crates/tower-cmd/src/catalogs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1854,8 +1854,10 @@ mod tests {

#[test]
fn catalog_help_marks_storage_beta_in_short_and_long_help() {
let short_help = catalogs_cmd().render_help().to_string();
let long_help = catalogs_cmd().render_long_help().to_string();
// term_width(0) turns off help wrapping, which otherwise follows the
// width of the terminal the tests run in.
let short_help = catalogs_cmd().term_width(0).render_help().to_string();
let long_help = catalogs_cmd().term_width(0).render_long_help().to_string();

for help in [short_help, long_help] {
assert!(help.contains("includes Storage [beta]"));
Expand All @@ -1865,7 +1867,7 @@ mod tests {

#[test]
fn storage_specific_command_and_flag_are_marked_beta() {
let mut command = catalogs_cmd();
let mut command = catalogs_cmd().mut_subcommand("credentials", |c| c.term_width(0));
let credentials_help = command
.find_subcommand_mut("credentials")
.expect("credentials command should exist")
Expand All @@ -1874,7 +1876,7 @@ mod tests {
assert!(credentials_help
.contains("Vend short-lived catalog credentials for external tools [beta]"));

let mut command = catalogs_cmd();
let mut command = catalogs_cmd().mut_subcommand("list", |c| c.term_width(0));
let list_help = command
.find_subcommand_mut("list")
.expect("list command should exist")
Expand Down
4 changes: 3 additions & 1 deletion crates/tower-cmd/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,9 @@ mod tests {

#[test]
fn root_help_scopes_beta_label_to_storage() {
let help = root_cmd().render_help().to_string();
// term_width(0) turns off help wrapping, which otherwise follows the
// width of the terminal the tests run in.
let help = root_cmd().term_width(0).render_help().to_string();

assert!(help.contains(
"Interact with the catalogs in your Tower account (includes Storage [beta])"
Expand Down
Loading