From 2e6bdd4041e2fdf9b877bc2270512ad29e9afc36 Mon Sep 17 00:00:00 2001
From: Jeffrey Regan <jregan@google.com>
Date: Tue, 22 Jan 2019 14:08:17 -0800
Subject: [PATCH] Add more loader tests.

---
 pkg/loader/fileloader.go      |  2 +-
 pkg/loader/fileloader_test.go | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkg/loader/fileloader.go b/pkg/loader/fileloader.go
index 2393a723f..9973e4e4b 100644
--- a/pkg/loader/fileloader.go
+++ b/pkg/loader/fileloader.go
@@ -133,7 +133,7 @@ func newFileLoaderAt(
 	}
 	if !fSys.IsDir(absRoot) {
 		return nil, fmt.Errorf(
-			"absolute root dir '%s' does not exist", absRoot)
+			"'%s' does not exist or is not a directory", absRoot)
 	}
 	return &fileLoader{
 		roots:   append(roots, absRoot),
diff --git a/pkg/loader/fileloader_test.go b/pkg/loader/fileloader_test.go
index 8598ff5b0..bc94c2c09 100644
--- a/pkg/loader/fileloader_test.go
+++ b/pkg/loader/fileloader_test.go
@@ -61,6 +61,25 @@ func MakeFakeFs(td []testData) fs.FileSystem {
 	return fSys
 }
 
+func TestNewFileLoaderAt_DemandsDirectory(t *testing.T) {
+	fSys := MakeFakeFs(testCases)
+	_, err := newFileLoaderAt("/foo", fSys, []string{}, nil)
+	if err != nil {
+		t.Fatalf("Unexpected error - a directory should work.")
+	}
+	_, err = newFileLoaderAt("/foo/project", fSys, []string{}, nil)
+	if err != nil {
+		t.Fatalf("Unexpected error - a directory should work.")
+	}
+	_, err = newFileLoaderAt("/foo/project/fileA.yaml", fSys, []string{}, nil)
+	if err == nil {
+		t.Fatalf("Expected error - a file should not work.")
+	}
+	if !strings.Contains(err.Error(), "does not exist or is not a directory") {
+		t.Fatalf("unexpected err: %v", err)
+	}
+}
+
 func TestLoaderLoad(t *testing.T) {
 	l1 := NewFileLoaderAtRoot(MakeFakeFs(testCases))
 	if "/" != l1.Root() {