Add full test coverage to key package

key/key.go

@@ -1,9 +1,10 @@
 package key
 
 import (
+	"bytes"
+	"errors"
 	"fmt"
 	"io/ioutil"
-	"os"
 	"os/user"
 	"sort"
 	"strings"
@@ -57,18 +58,16 @@ var defaultBinding = Binding{
 // and returns a map representation of the file
 // It also looks for errors, and ambiguities within the file and notifies the user of them
 func LoadSettings() (b Binding, err error) {
-	b, err = parseSettings()
-	if err != nil {
-		return
-	}
-
+	b = parseSettings()
 	warnings, fatals := b.verify()
+
 	if len(fatals) != 0 {
-		fmt.Println(color.Red(color.Regular, "🚫  %d unrecoverable error(s) detected in .fac.yml\n", len(fatals)))
+		var errorMsg bytes.Buffer
+		errorMsg.WriteString(color.Red(color.Regular, "🚫  %d unrecoverable error(s) detected in .fac.yml\n", len(fatals)))
 		for _, msg := range fatals {
-			fmt.Println(color.Red(color.Regular, "%s", msg))
+			errorMsg.WriteString(color.Red(color.Regular, "\n%s", msg))
 		}
-		os.Exit(1)
+		return nil, errors.New(errorMsg.String())
 	}
 
 	if len(warnings) != 0 {
@@ -86,25 +85,26 @@ func LoadSettings() (b Binding, err error) {
 
 // parseSettings looks for `$HOME/.fac.yml` and parses it into a `Binding` value
 // If the file does not exist, it returns the `defaultBinding`
-func parseSettings() (b Binding, err error) {
+func parseSettings() (b Binding) {
 	usr, err := currentUser()
 	if err != nil {
 		fmt.Println(color.Yellow(color.Regular, "fac: %s. Default key-bindings will be used", err.Error()))
-		return defaultBinding, nil
+		return defaultBinding
 	}
 
 	// Read config file
 	f, err := ioutil.ReadFile(usr.HomeDir + "/.fac.yml")
 	if err != nil {
 		fmt.Println(color.Yellow(color.Regular, "fac: %s. Default key-bindings will be used", err.Error()))
-		return defaultBinding, nil
+		return defaultBinding
 	}
 
 	// Parse config file
 	if err = yaml.Unmarshal(f, &b); err != nil {
 		fmt.Println(color.Yellow(color.Regular, "fac: %s. Default key-bindings will be used", err.Error()))
-		return defaultBinding, nil
+		return defaultBinding
 	}
+
 	return
 }
 

key/key_test.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/user"
 	"sort"
+	"strings"
 	"testing"
 
 	"gopkg.in/yaml.v2"
@@ -66,10 +67,6 @@ func TestLoadSettings(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		if test.fatals != nil {
-			continue
-		}
-
 		// Create dummy yml file with content
 		f, err := os.Create(".fac.yml")
 		testhelper.Ok(t, err)
@@ -78,10 +75,16 @@ func TestLoadSettings(t *testing.T) {
 		f.Close()
 
 		output, err := LoadSettings()
-		testhelper.Ok(t, err)
-
-		test.expected.consolidate()
-		testhelper.Equals(t, test.expected, output)
+		if len(test.fatals) == 0 {
+			testhelper.Ok(t, err)
+			test.expected.consolidate()
+			testhelper.Equals(t, test.expected, output)
+		} else {
+			testhelper.Assert(t, err != nil, "%v should fail", test)
+			for _, msg := range test.fatals {
+				testhelper.Assert(t, strings.Contains(err.Error(), msg), "Error message should contain message %s", msg)
+			}
+		}
 	}
 }
 
@@ -90,14 +93,14 @@ func TestParseSettings(t *testing.T) {
 	currentUser = func() (*user.User, error) {
 		return nil, errors.New("Could not find current user")
 	}
-	binding, _ := parseSettings()
+	binding := parseSettings()
 	testhelper.Equals(t, defaultBinding, binding)
 
 	// Test with invalid directory
 	currentUser = func() (*user.User, error) {
 		return &user.User{HomeDir: "foobar"}, nil
 	}
-	binding, _ = parseSettings()
+	binding = parseSettings()
 	testhelper.Equals(t, defaultBinding, binding)
 
 	// Test with valid directory with empty file
@@ -108,12 +111,12 @@ func TestParseSettings(t *testing.T) {
 	testhelper.Ok(t, err)
 	defer f.Close()
 
-	binding, _ = parseSettings()
+	binding = parseSettings()
 	testhelper.Equals(t, 0, len(binding))
 
 	// Test valid directory with erroneous content
 	f.WriteString("erroneous content")
-	binding, _ = parseSettings()
+	binding = parseSettings()
 	testhelper.Equals(t, defaultBinding, binding)
 }