From fa42a2e465f23de2b931b77c21eebb669b3c792c Mon Sep 17 00:00:00 2001 From: Maciej Sypien Date: Sun, 22 Sep 2024 22:11:21 +0200 Subject: [PATCH] refactor: dry duplicated method --- src/tmux_utils.sh | 6 ++++++ tests/linux/test_check_gruvbox_dark256_enabled.sh | 2 +- .../linux/test_check_gruvbox_dark256_transparent_enabled.sh | 2 +- tests/linux/test_check_gruvbox_dark_enabled.sh | 2 +- tests/linux/test_check_gruvbox_dark_transparent_enabled.sh | 2 +- tests/linux/test_check_gruvbox_light256_enabled.sh | 2 +- .../test_check_gruvbox_light256_transparent_enabled.sh | 2 +- tests/linux/test_check_gruvbox_light_enabled.sh | 2 +- tests/linux/test_check_gruvbox_light_transparent_enabled.sh | 2 +- .../linux/test_without_theme_fallback_to_gruvbox_dark256.sh | 2 +- 10 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/tmux_utils.sh b/src/tmux_utils.sh index 87ab063..30ccb94 100644 --- a/src/tmux_utils.sh +++ b/src/tmux_utils.sh @@ -61,3 +61,9 @@ tmux_set_window_option_now() { _value="$2" tmux set-window-option -gq "$_option_name" "$_value" } + +# return the value of status style +tmux_get_statusstyle() { + local _val=tmux show-option -gqv status-style + echo "$_val" +} diff --git a/tests/linux/test_check_gruvbox_dark256_enabled.sh b/tests/linux/test_check_gruvbox_dark256_enabled.sh index 5cf29b1..4779e99 100755 --- a/tests/linux/test_check_gruvbox_dark256_enabled.sh +++ b/tests/linux/test_check_gruvbox_dark256_enabled.sh @@ -41,7 +41,7 @@ EOF fi # check if status is not transparent _status_style_expected="bg=colour237,fg=colour223" - _status_style_current=$(tmux show-option -gqv status-style) + _status_style_current=$(tmux_get_statusstyle) if [[ "$_status_style_current" != "$_status_style_expected" ]]; then helper_print_fail "status-style did not match" "$_status_style_current" "$_status_style_expected" helper_teardown diff --git a/tests/linux/test_check_gruvbox_dark256_transparent_enabled.sh b/tests/linux/test_check_gruvbox_dark256_transparent_enabled.sh index 7ae8d5e..d1656ed 100755 --- a/tests/linux/test_check_gruvbox_dark256_transparent_enabled.sh +++ b/tests/linux/test_check_gruvbox_dark256_transparent_enabled.sh @@ -42,7 +42,7 @@ EOF fi # check if status is not transparent _status_style_expected="bg=default,fg=colour223" - _status_style_current=$(tmux show-option -gqv status-style) + _status_style_current=$(tmux_get_statusstyle) if [[ "$_status_style_current" != "$_status_style_expected" ]]; then helper_print_fail "status-style did not match" "$_status_style_current" "$_status_style_expected" helper_teardown diff --git a/tests/linux/test_check_gruvbox_dark_enabled.sh b/tests/linux/test_check_gruvbox_dark_enabled.sh index 158b2c3..ee111d7 100755 --- a/tests/linux/test_check_gruvbox_dark_enabled.sh +++ b/tests/linux/test_check_gruvbox_dark_enabled.sh @@ -41,7 +41,7 @@ EOF fi # check if status is not transparent _status_style_expected="bg=#3c3836,fg=#ebdbb2" - _status_style_current=$(tmux show-option -gqv status-style) + _status_style_current=$(tmux_get_statusstyle) if [[ "$_status_style_current" != "$_status_style_expected" ]]; then helper_print_fail "status-style did not match" "$_status_style_current" "$_status_style_expected" helper_teardown diff --git a/tests/linux/test_check_gruvbox_dark_transparent_enabled.sh b/tests/linux/test_check_gruvbox_dark_transparent_enabled.sh index 9364808..5c94b36 100755 --- a/tests/linux/test_check_gruvbox_dark_transparent_enabled.sh +++ b/tests/linux/test_check_gruvbox_dark_transparent_enabled.sh @@ -42,7 +42,7 @@ EOF fi # check if status is not transparent _status_style_expected="bg=default,fg=#ebdbb2" - _status_style_current=$(tmux show-option -gqv status-style) + _status_style_current=$(tmux_get_statusstyle) if [[ "$_status_style_current" != "$_status_style_expected" ]]; then helper_print_fail "status-style did not match" "$_status_style_current" "$_status_style_expected" helper_teardown diff --git a/tests/linux/test_check_gruvbox_light256_enabled.sh b/tests/linux/test_check_gruvbox_light256_enabled.sh index 0d4426d..26ab1b3 100755 --- a/tests/linux/test_check_gruvbox_light256_enabled.sh +++ b/tests/linux/test_check_gruvbox_light256_enabled.sh @@ -41,7 +41,7 @@ EOF fi # check if status is not transparent _status_style_expected="bg=colour252,fg=colour239" - _status_style_current=$(tmux show-option -gqv status-style) + _status_style_current=$(tmux_get_statusstyle) if [[ "$_status_style_current" != "$_status_style_expected" ]]; then helper_print_fail "status-style did not match" "$_status_style_current" "$_status_style_expected" helper_teardown diff --git a/tests/linux/test_check_gruvbox_light256_transparent_enabled.sh b/tests/linux/test_check_gruvbox_light256_transparent_enabled.sh index cbfcdb6..3ac118f 100755 --- a/tests/linux/test_check_gruvbox_light256_transparent_enabled.sh +++ b/tests/linux/test_check_gruvbox_light256_transparent_enabled.sh @@ -42,7 +42,7 @@ EOF fi # check if status is not transparent _status_style_expected="bg=default,fg=colour239" - _status_style_current=$(tmux show-option -gqv status-style) + _status_style_current=$(tmux_get_statusstyle) if [[ "$_status_style_current" != "$_status_style_expected" ]]; then helper_print_fail "status-style did not match" "$_status_style_current" "$_status_style_expected" helper_teardown diff --git a/tests/linux/test_check_gruvbox_light_enabled.sh b/tests/linux/test_check_gruvbox_light_enabled.sh index b460794..13930af 100755 --- a/tests/linux/test_check_gruvbox_light_enabled.sh +++ b/tests/linux/test_check_gruvbox_light_enabled.sh @@ -41,7 +41,7 @@ EOF fi # check if status is not transparent _status_style_expected="bg=#ebdbb2,fg=#3c3836" - _status_style_current=$(tmux show-option -gqv status-style) + _status_style_current=$(tmux_get_statusstyle) if [[ "$_status_style_current" != "$_status_style_expected" ]]; then helper_print_fail "status-style did not match" "$_status_style_current" "$_status_style_expected" helper_teardown diff --git a/tests/linux/test_check_gruvbox_light_transparent_enabled.sh b/tests/linux/test_check_gruvbox_light_transparent_enabled.sh index eb30f07..0f1d914 100755 --- a/tests/linux/test_check_gruvbox_light_transparent_enabled.sh +++ b/tests/linux/test_check_gruvbox_light_transparent_enabled.sh @@ -42,7 +42,7 @@ EOF fi # check if status is not transparent _status_style_expected="bg=default,fg=#3c3836" - _status_style_current=$(tmux show-option -gqv status-style) + _status_style_current=$(tmux_get_statusstyle) if [[ "$_status_style_current" != "$_status_style_expected" ]]; then helper_print_fail "status-style did not match" "$_status_style_current" "$_status_style_expected" helper_teardown diff --git a/tests/linux/test_without_theme_fallback_to_gruvbox_dark256.sh b/tests/linux/test_without_theme_fallback_to_gruvbox_dark256.sh index 0022de5..abd7b9f 100755 --- a/tests/linux/test_without_theme_fallback_to_gruvbox_dark256.sh +++ b/tests/linux/test_without_theme_fallback_to_gruvbox_dark256.sh @@ -44,7 +44,7 @@ EOF fi # check if status is not transparent _status_style_expected="bg=colour237,fg=colour223" - _status_style_current=$(tmux show-option -gqv status-style) + _status_style_current=$(tmux_get_statusstyle) if [[ "$_status_style_current" != "$_status_style_expected" ]]; then helper_print_fail "status-style did not match" "$_status_style_current" "$_status_style_expected" helper_teardown