more fixes

99designs · Jul 13, 2018 · ea4f26c · ea4f26c
1 parent 1066953
commit ea4f26c
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 40 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/codegen/config.go b/codegen/config.go
@@ -167,7 +167,8 @@ func findCfg() (string, error) {
 	}
 
 	cfg := findCfgInDir(dir)
-	for cfg == "" && dir != "/" {
+
+	for cfg == "" && dir != filepath.Dir(dir) {
 		dir = filepath.Dir(dir)
 		cfg = findCfgInDir(dir)
 	}

diff --git a/codegen/config_test.go b/codegen/config_test.go
@@ -13,7 +13,7 @@ import (
 func TestLoadConfig(t *testing.T) {
 	t.Run("config does not exist", func(t *testing.T) {
 		_, err := LoadConfig("doesnotexist.yml")
-		require.EqualError(t, err, "unable to read config: open doesnotexist.yml: no such file or directory")
+		require.Error(t, err)
 	})
 
 	t.Run("malformed config", func(t *testing.T) {

diff --git a/example/dataloader/addressloader_gen.go b/example/dataloader/addressloader_gen.go
diff --git a/example/dataloader/itemsliceloader_gen.go b/example/dataloader/itemsliceloader_gen.go