From a9b7c4f66c05063f59cadd136d74b516ca1647c9 Mon Sep 17 00:00:00 2001 From: Vivian Brown Date: Wed, 13 May 2020 09:52:13 -0700 Subject: [PATCH] Fix err check in ntoml path checker --- ntoml/netlify_toml.go | 2 +- ntoml/netlify_toml_test.go | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ntoml/netlify_toml.go b/ntoml/netlify_toml.go index d3df0da..43d1369 100644 --- a/ntoml/netlify_toml.go +++ b/ntoml/netlify_toml.go @@ -87,7 +87,7 @@ func findOnlyOneExistingPath(base string, paths ...string) (path string, err err foundPaths := make([]string, 0, len(paths)) for _, possiblePath := range paths { p := filepath.Join(base, possiblePath) - if fi, err := os.Stat(p); err != nil && !fi.IsDir() { + if fi, err := os.Stat(p); err == nil && !fi.IsDir() { foundPaths = append(foundPaths, p) } } diff --git a/ntoml/netlify_toml_test.go b/ntoml/netlify_toml_test.go index 2e0b69d..c1452e0 100644 --- a/ntoml/netlify_toml_test.go +++ b/ntoml/netlify_toml_test.go @@ -231,3 +231,15 @@ context: return tmp } + +func TestFindOnlyOneExistingPath(t *testing.T) { + _, err := findOnlyOneExistingPath("", "does-not-exist") + assert.IsType(t, &FoundNoConfigPathError{}, err) + + tmp, err := ioutil.TempFile("", "netlify-*.yaml") + require.NoError(t, err) + defer os.Remove(tmp.Name()) + path, err := findOnlyOneExistingPath("", tmp.Name()) + assert.NoError(t, err) + assert.Equal(t, tmp.Name(), path) +}