Skip to content

Commit 14b9448

Browse files
committed
fixes related to reviewer suggestions
1 parent 4f55cfc commit 14b9448

3 files changed

Lines changed: 36 additions & 13 deletions

File tree

internal/iostreams/printer.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,11 @@ func (io *IOStreams) PrintInfo(ctx context.Context, shouldTrace bool, format str
8989
span, _ := opentracing.StartSpanFromContext(ctx, "printInfo", opentracing.Tag{Key: "printInfo", Value: message})
9090
defer span.Finish()
9191
}
92-
io.Stdout.Println(message)
92+
if style.IsCharmEnabled() {
93+
io.Stdout.Println(message)
94+
} else {
95+
io.Stdout.Println(style.Styler().Reset(message))
96+
}
9397
}
9498

9599
// PrintTrace prints traceID and values to stdout if SLACK_TEST_TRACE=true

internal/pkg/apps/install_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,26 +1686,30 @@ func TestContinueDespiteWarning(t *testing.T) {
16861686
tests := map[string]struct {
16871687
warnings slackerror.Warnings
16881688
confirmPrompt bool
1689+
expectsPrompt bool
16891690
expectedResult bool
16901691
}{
16911692
"user confirms breaking change": {
16921693
warnings: slackerror.Warnings{
16931694
{Code: "breaking_change", Message: "something changed"},
16941695
},
16951696
confirmPrompt: true,
1697+
expectsPrompt: true,
16961698
expectedResult: true,
16971699
},
16981700
"user declines breaking change": {
16991701
warnings: slackerror.Warnings{
17001702
{Code: "breaking_change", Message: "something changed"},
17011703
},
17021704
confirmPrompt: false,
1705+
expectsPrompt: true,
17031706
expectedResult: false,
17041707
},
17051708
"non-breaking warning continues without prompt": {
17061709
warnings: slackerror.Warnings{
17071710
{Code: "some_warning", Message: "just a warning"},
17081711
},
1712+
expectsPrompt: false,
17091713
expectedResult: true,
17101714
},
17111715
}
@@ -1729,6 +1733,9 @@ func TestContinueDespiteWarning(t *testing.T) {
17291733
result, err := continueDespiteWarning(ctx, clients, tc.warnings)
17301734
require.NoError(t, err)
17311735
assert.Equal(t, tc.expectedResult, result)
1736+
if !tc.expectsPrompt {
1737+
clientsMock.IO.AssertNotCalled(t, "ConfirmPrompt", mock.Anything, "Confirm changes?", false)
1738+
}
17321739
})
17331740
}
17341741
}

internal/style/style_test.go

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,18 +129,30 @@ func TestEmojiEmpty(t *testing.T) {
129129
}
130130

131131
func TestToggleCharm(t *testing.T) {
132-
defer func() {
133-
isCharmEnabled = false
134-
}()
135-
t.Run("enables charm styling", func(t *testing.T) {
136-
ToggleCharm(true)
137-
assert.True(t, isCharmEnabled)
138-
})
139-
t.Run("disables charm styling", func(t *testing.T) {
140-
isCharmEnabled = true
141-
ToggleCharm(false)
142-
assert.False(t, isCharmEnabled)
143-
})
132+
tests := map[string]struct {
133+
initial bool
134+
toggle bool
135+
expected bool
136+
}{
137+
"enables charm styling": {
138+
initial: false,
139+
toggle: true,
140+
expected: true,
141+
},
142+
"disables charm styling": {
143+
initial: true,
144+
toggle: false,
145+
expected: false,
146+
},
147+
}
148+
for name, tc := range tests {
149+
t.Run(name, func(t *testing.T) {
150+
isCharmEnabled = tc.initial
151+
defer func() { isCharmEnabled = false }()
152+
ToggleCharm(tc.toggle)
153+
assert.Equal(t, tc.expected, isCharmEnabled)
154+
})
155+
}
144156
}
145157

146158
// testStyleFunc verifies a style function returns the original text (stripped of ANSI)

0 commit comments

Comments
 (0)