From a746ab6975a8ff25a232543b98596d4a88e154e4 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Wed, 14 Oct 2020 12:16:48 -0700 Subject: [PATCH] Remove unnecessary parameter passing in WtfApp Signed-off-by: Chris Cummer --- app/exit_message.go | 13 ++++++------- app/exit_message_test.go | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/exit_message.go b/app/exit_message.go index 6db7df57..6dcd3e05 100644 --- a/app/exit_message.go +++ b/app/exit_message.go @@ -7,7 +7,6 @@ import ( "github.com/logrusorgru/aurora" "github.com/olebedev/config" - "github.com/wtfutil/wtf/support" ) const exitMessageHeader = ` @@ -25,14 +24,14 @@ const exitMessageHeader = ` func (wtfApp *WtfApp) DisplayExitMessage() { exitMessageIsDisplayable := readDisplayableConfig(wtfApp.config) - wtfApp.displayExitMsg(wtfApp.ghUser, exitMessageIsDisplayable) + wtfApp.displayExitMsg(exitMessageIsDisplayable) } /* -------------------- Unexported Functions -------------------- */ -func (wtfApp *WtfApp) displayExitMsg(ghUser *support.GitHubUser, exitMessageIsDisplayable bool) string { +func (wtfApp *WtfApp) displayExitMsg(exitMessageIsDisplayable bool) string { // If a sponsor or contributor and opt out of seeing the exit message, do not display it - if (ghUser.IsContributor || ghUser.IsSponsor) && !exitMessageIsDisplayable { + if (wtfApp.ghUser.IsContributor || wtfApp.ghUser.IsSponsor) && !exitMessageIsDisplayable { return "" } @@ -40,15 +39,15 @@ func (wtfApp *WtfApp) displayExitMsg(ghUser *support.GitHubUser, exitMessageIsDi msgs = append(msgs, aurora.Magenta(exitMessageHeader).String()) - if ghUser.IsContributor { + if wtfApp.ghUser.IsContributor { msgs = append(msgs, wtfApp.contributorThankYouMessage()) } - if ghUser.IsSponsor { + if wtfApp.ghUser.IsSponsor { msgs = append(msgs, wtfApp.sponsorThankYouMessage()) } - if !ghUser.IsContributor && !ghUser.IsSponsor { + if !wtfApp.ghUser.IsContributor && !wtfApp.ghUser.IsSponsor { msgs = append(msgs, wtfApp.supportRequestMessage()) } diff --git a/app/exit_message_test.go b/app/exit_message_test.go index 06dcdfad..b236d4e3 100644 --- a/app/exit_message_test.go +++ b/app/exit_message_test.go @@ -52,12 +52,12 @@ func Test_displayExitMessage(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { wtfApp := WtfApp{} - ghUser := &support.GitHubUser{ + wtfApp.ghUser = &support.GitHubUser{ IsContributor: tt.isContributor, IsSponsor: tt.isSponsor, } - actual := wtfApp.displayExitMsg(ghUser, tt.isDisplayable) + actual := wtfApp.displayExitMsg(tt.isDisplayable) if tt.compareWith == "equals" { assert.Equal(t, actual, tt.expected)