Add context_test.go

context.go

@@ -6,8 +6,9 @@ type Context struct {
 	InsideTmuxSession bool
 }
 
-func CreateContext() *Context {
+func CreateContext() Context {
 	_, tmux := os.LookupEnv("TMUX")
+	os.Environ()
 	insideTmuxSession := os.Getenv("TERM") == "screen" || tmux
-	return &Context{insideTmuxSession}
+	return Context{insideTmuxSession}
 }

context_test.go

@@ -0,0 +1,51 @@
+package main
+
+import (
+	"os"
+	"reflect"
+	"testing"
+)
+
+var environmentTestTable = []struct {
+	environment map[string]string
+	context     Context
+}{
+	{
+		map[string]string{},
+		Context{InsideTmuxSession: false},
+	},
+	{
+		map[string]string{
+			"TMUX": "",
+		},
+		Context{InsideTmuxSession: true},
+	},
+	{
+		map[string]string{
+			"TERM": "screen",
+		},
+		Context{InsideTmuxSession: true},
+	},
+	{
+		map[string]string{
+			"TERM": "xterm",
+			"TMUX": "",
+		},
+		Context{InsideTmuxSession: true},
+	},
+}
+
+func TestCreateContext(t *testing.T) {
+	os.Clearenv()
+	for _, v := range environmentTestTable {
+		for key, value := range v.environment {
+			os.Setenv(key, value)
+		}
+
+		context := CreateContext()
+
+		if !reflect.DeepEqual(v.context, context) {
+			t.Errorf("expected context %v, got %v", v.context, context)
+		}
+	}
+}

main.go

@@ -90,10 +90,10 @@ func main() {
 		} else {
 			fmt.Println("Starting new windows...")
 		}
-		err = smug.Start(*config, options, *context)
+		err = smug.Start(*config, options, context)
 		if err != nil {
 			fmt.Println("Oops, an error occurred! Rolling back...")
-			smug.Stop(*config, options, *context)
+			smug.Stop(*config, options, context)
 		}
 	case CommandStop:
 		if len(options.Windows) == 0 {
@@ -101,7 +101,7 @@ func main() {
 		} else {
 			fmt.Println("Killing windows...")
 		}
-		err = smug.Stop(*config, options, *context)
+		err = smug.Stop(*config, options, context)
 	}
 
 	if err != nil {

options_test.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"errors"
 	"reflect"
 	"testing"
 
@@ -91,6 +92,12 @@ var usageTestTable = []struct {
 		ErrHelp,
 		1,
 	},
+	{
+		[]string{"start", "--test"},
+		Options{},
+		errors.New("unknown flag: --test"),
+		0,
+	},
 }
 
 func TestParseOptions(t *testing.T) {
@@ -116,7 +123,7 @@ func TestParseOptions(t *testing.T) {
 			t.Errorf("expected to get %d help calls, got %d", v.helpCalls, helpCalls)
 		}
 
-		if err != v.err {
+		if v.err != nil && err.Error() != v.err.Error() {
 			t.Errorf("expected to get error %v, got %v", v.err, err)
 		}