Fixing scenario in which using a non-existing file would return an er…

…ror about schema
stefanoj3 · Oct 31, 2019 · 1512cad · 1512cad
1 parent bb63327
commit 1512cad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pkg/dictionary/dictionary.go b/pkg/dictionary/dictionary.go
@@ -5,18 +5,19 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"strings"
 
 	"github.com/pkg/errors"
 )
 
 const commentPrefix = "#"
 
 func NewDictionaryFrom(path string, doer Doer) ([]string, error) {
-	if _, err := os.Stat(path); !os.IsNotExist(err) {
-		return newDictionaryFromLocalFile(path)
+	if strings.HasPrefix(path, "http") {
+		return newDictionaryFromRemoteFile(path, doer)
 	}
 
-	return newDictionaryFromRemoteFile(path, doer)
+	return newDictionaryFromLocalFile(path)
 }
 
 func newDictionaryFromLocalFile(path string) ([]string, error) {

diff --git a/pkg/dictionary/dictionary_integration_test.go b/pkg/dictionary/dictionary_integration_test.go
@@ -65,6 +65,8 @@ func TestDictionaryFromFileWithInvalidPath(t *testing.T) {
 	d, err := dictionary.NewDictionaryFrom("testdata/gibberish_nonexisting_file", &http.Client{})
 	assert.Error(t, err)
 	assert.Nil(t, d)
+
+	assert.Contains(t, err.Error(), "unable to open")
 }
 
 func TestNewDictionaryFromRemoteFile(t *testing.T) {