Add tests

samcoe · samcoe · commit 8f27cb35e9ae · 2020-09-25T08:50:24.000+02:00
diff --git a/pkg/iostreams/iostreams.go b/pkg/iostreams/iostreams.go
@@ -55,7 +55,6 @@ func (s *IOStreams) ColorSupport256() bool {
 }
 
 func (s *IOStreams) DetectTerminalTheme() string {
-	style := os.Getenv("GLAMOUR_STYLE")
 	if !s.ColorEnabled() {
 		s.terminalTheme = "none"
 		return "none"
@@ -66,6 +65,7 @@ func (s *IOStreams) DetectTerminalTheme() string {
 		return "none"
 	}
 
+	style := os.Getenv("GLAMOUR_STYLE")
 	if style != "" && style != "auto" {
 		s.terminalTheme = "none"
 		return "none"
diff --git a/pkg/markdown/markdown.go b/pkg/markdown/markdown.go
@@ -25,7 +25,7 @@ func Render(text, style string) (string, error) {
 }
 
 func GetStyle(defaultStyle string) string {
-	style := os.Getenv("GLAMOUR_STYLE")
+	style := fromEnv()
 	if style != "" && style != "auto" {
 		return style
 	}
@@ -36,3 +36,7 @@ func GetStyle(defaultStyle string) string {
 
 	return "notty"
 }
+
+var fromEnv = func() string {
+	return os.Getenv("GLAMOUR_STYLE")
+}
diff --git a/pkg/markdown/markdown_test.go b/pkg/markdown/markdown_test.go
@@ -0,0 +1,141 @@
+package markdown
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_Render(t *testing.T) {
+	type input struct {
+		text  string
+		style string
+	}
+	type output struct {
+		wantsErr bool
+	}
+	tests := []struct {
+		name   string
+		input  input
+		output output
+	}{
+		{
+			name: "invalid glamour style",
+			input: input{
+				text:  "some text",
+				style: "invalid",
+			},
+			output: output{
+				wantsErr: true,
+			},
+		},
+		{
+			name: "valid glamour style",
+			input: input{
+				text:  "some text",
+				style: "dark",
+			},
+			output: output{
+				wantsErr: false,
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			_, err := Render(tt.input.text, tt.input.style)
+			if tt.output.wantsErr {
+				assert.Error(t, err)
+				return
+			}
+			assert.NoError(t, err)
+		})
+	}
+}
+
+func Test_GetStyle(t *testing.T) {
+	type input struct {
+		glamourStyle  string
+		terminalTheme string
+	}
+	type output struct {
+		style string
+	}
+	tests := []struct {
+		name   string
+		input  input
+		output output
+	}{
+		{
+			name: "no glamour style and no terminal theme",
+			input: input{
+				glamourStyle:  "",
+				terminalTheme: "none",
+			},
+			output: output{
+				style: "notty",
+			},
+		},
+		{
+			name: "auto glamour style and no terminal theme",
+			input: input{
+				glamourStyle:  "auto",
+				terminalTheme: "none",
+			},
+			output: output{
+				style: "notty",
+			},
+		},
+		{
+			name: "user glamour style and no terminal theme",
+			input: input{
+				glamourStyle:  "somestyle",
+				terminalTheme: "none",
+			},
+			output: output{
+				style: "somestyle",
+			},
+		},
+		{
+			name: "no glamour style and light terminal theme",
+			input: input{
+				glamourStyle:  "",
+				terminalTheme: "light",
+			},
+			output: output{
+				style: "light",
+			},
+		},
+		{
+			name: "no glamour style and dark terminal theme",
+			input: input{
+				glamourStyle:  "",
+				terminalTheme: "dark",
+			},
+			output: output{
+				style: "dark",
+			},
+		},
+		{
+			name: "no glamour style and unknown terminal theme",
+			input: input{
+				glamourStyle:  "",
+				terminalTheme: "unknown",
+			},
+			output: output{
+				style: "notty",
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		fromEnv = func() string {
+			return tt.input.glamourStyle
+		}
+
+		t.Run(tt.name, func(t *testing.T) {
+			style := GetStyle(tt.input.terminalTheme)
+			assert.Equal(t, tt.output.style, style)
+		})
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ func (s *IOStreams) ColorSupport256() bool {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`func (s *IOStreams) DetectTerminalTheme() string {`
`58`		`- style := os.Getenv("GLAMOUR_STYLE")`
`59`	`58`	`if !s.ColorEnabled() {`
`60`	`59`	`s.terminalTheme = "none"`
`61`	`60`	`return "none"`
`@@ -66,6 +65,7 @@ func (s *IOStreams) DetectTerminalTheme() string {`
`66`	`65`	`return "none"`
`67`	`66`	`}`
`68`	`67`
	`68`	`+ style := os.Getenv("GLAMOUR_STYLE")`
`69`	`69`	`if style != "" && style != "auto" {`
`70`	`70`	`s.terminalTheme = "none"`
`71`	`71`	`return "none"`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func Render(text, style string) (string, error) {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`func GetStyle(defaultStyle string) string {`
`28`		`- style := os.Getenv("GLAMOUR_STYLE")`
	`28`	`+ style := fromEnv()`
`29`	`29`	`if style != "" && style != "auto" {`
`30`	`30`	`return style`
`31`	`31`	`}`
`@@ -36,3 +36,7 @@ func GetStyle(defaultStyle string) string {`
`36`	`36`
`37`	`37`	`return "notty"`
`38`	`38`	`}`
	`39`	`+`
	`40`	`+var fromEnv = func() string {`
	`41`	`+ return os.Getenv("GLAMOUR_STYLE")`
	`42`	`+}`