aboutsummaryrefslogtreecommitdiffhomepage
path: root/reader/json
diff options
context:
space:
mode:
authorGravatar Frédéric Guillot <fred@miniflux.net>2018-02-27 21:08:32 -0800
committerGravatar Frédéric Guillot <fred@miniflux.net>2018-02-27 21:08:32 -0800
commit953d0a2dc05714c22f7c9c389a860fd38c07b66e (patch)
treedbbbb0659ed8e69e02c9b977b63550d1192d6be2 /reader/json
parent9694861cb6ad08ded824b9bf04ef19a3a168d7b9 (diff)
Support localized feed errors generated by background workers
Diffstat (limited to 'reader/json')
-rw-r--r--reader/json/parser.go2
-rw-r--r--reader/json/parser_test.go6
2 files changed, 1 insertions, 7 deletions
diff --git a/reader/json/parser.go b/reader/json/parser.go
index 52b4809..ddd3e4f 100644
--- a/reader/json/parser.go
+++ b/reader/json/parser.go
@@ -13,7 +13,7 @@ import (
)
// Parse returns a normalized feed struct from a JON feed.
-func Parse(data io.Reader) (*model.Feed, error) {
+func Parse(data io.Reader) (*model.Feed, *errors.LocalizedError) {
feed := new(jsonFeed)
decoder := json.NewDecoder(data)
if err := decoder.Decode(&feed); err != nil {
diff --git a/reader/json/parser_test.go b/reader/json/parser_test.go
index a3d5b5b..19c12c9 100644
--- a/reader/json/parser_test.go
+++ b/reader/json/parser_test.go
@@ -9,8 +9,6 @@ import (
"strings"
"testing"
"time"
-
- "github.com/miniflux/miniflux/errors"
)
func TestParseJsonFeed(t *testing.T) {
@@ -377,8 +375,4 @@ func TestParseInvalidJSON(t *testing.T) {
if err == nil {
t.Error("Parse should returns an error")
}
-
- if _, ok := err.(errors.LocalizedError); !ok {
- t.Error("The error returned must be a LocalizedError")
- }
}