Skip to content

Commit 2e2f4be

Browse files
committed
update refresh package to v3
* fix broken tests * update refresh package for abcweb dev command. new refresh no longer uses deprecated commands.
1 parent a1eec84 commit 2e2f4be

File tree

5 files changed

+555
-206
lines changed

5 files changed

+555
-206
lines changed

abcmiddleware/errors_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ func TestRemoveAndAdd(t *testing.T) {
3434
Handler: nil,
3535
}
3636

37-
m := NewErrorManager(&abcrender.Render{})
37+
m := NewErrorManager(&abcrender.Render{}, "")
3838

39-
m.Add(NewError(ea, 404, "errors/404", nil))
40-
m.Add(NewError(eb, 404, "errors/404", nil))
39+
m.Add(NewError(ea, 404, "", "errors/404", nil))
40+
m.Add(NewError(eb, 404, "", "errors/404", nil))
4141

4242
if len(m.errors) != 2 {
4343
t.Errorf("expected len 2, got %d", len(m.errors))
@@ -76,8 +76,8 @@ func TestCustomErrorHandler(t *testing.T) {
7676

7777
// test handler route
7878
ea := errors.New("error1")
79-
m := NewErrorManager(&abcrender.Render{})
80-
m.Add(NewError(ea, 404, "errors/404", myHandler))
79+
m := NewErrorManager(&abcrender.Render{}, "")
80+
m.Add(NewError(ea, 404, "", "errors/404", myHandler))
8181
fn := m.Errors(func(w http.ResponseWriter, r *http.Request) error {
8282
return ea
8383
})
@@ -90,7 +90,7 @@ func TestCustomErrorHandler(t *testing.T) {
9090

9191
// test non-handler non-custom error route
9292
rndr := &mockRender{}
93-
m = NewErrorManager(rndr)
93+
m = NewErrorManager(rndr, "")
9494
fn = m.Errors(func(w http.ResponseWriter, r *http.Request) error {
9595
// generic error that isnt added to error manager
9696
// this should test default case
@@ -110,8 +110,8 @@ func TestCustomErrorHandler(t *testing.T) {
110110
// test non-handler but custom error route
111111
e1 := errors.New("100 error")
112112
rndr = &mockRender{}
113-
m = NewErrorManager(rndr)
114-
m.Add(NewError(e1, 100, "errors/100", nil))
113+
m = NewErrorManager(rndr, "")
114+
m.Add(NewError(e1, 100, "", "errors/100", nil))
115115
fn = m.Errors(func(w http.ResponseWriter, r *http.Request) error {
116116
// generic error that isnt added to error manager
117117
// this should test default case

cmd/dev.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"github.com/BurntSushi/toml"
1212
"github.com/spf13/cobra"
13-
"github.com/volatiletech/refresh/refresh"
13+
"github.com/volatiletech/refresh/v3/refresh"
1414
)
1515

1616
// devCmd represents the "dev" command

go.mod

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ go 1.14
55
require (
66
github.com/BurntSushi/toml v0.3.1
77
github.com/djherbis/times v1.2.0
8-
github.com/fatih/color v1.9.0 // indirect
98
github.com/friendsofgo/errors v0.9.2
109
github.com/go-chi/chi v4.1.1+incompatible
1110
github.com/go-sql-driver/mysql v1.5.0 // indirect
@@ -15,14 +14,14 @@ require (
1514
github.com/onsi/gomega v1.9.0 // indirect
1615
github.com/pierrre/archivefile v0.0.0-20170218184037-e2d100bc74f5
1716
github.com/satori/go.uuid v1.2.0
18-
github.com/spf13/afero v1.2.2
19-
github.com/spf13/cobra v1.0.0
17+
github.com/spf13/afero v1.6.0
18+
github.com/spf13/cobra v1.2.1
2019
github.com/spf13/pflag v1.0.5
21-
github.com/spf13/viper v1.6.3
22-
github.com/stretchr/testify v1.3.0
20+
github.com/spf13/viper v1.8.1
21+
github.com/stretchr/testify v1.7.0
2322
github.com/unrolled/render v1.0.3
2423
github.com/volatiletech/mig v1.2.0
25-
github.com/volatiletech/refresh v2.0.0+incompatible
26-
go.uber.org/zap v1.10.0
24+
github.com/volatiletech/refresh/v3 v3.0.4
25+
go.uber.org/zap v1.17.0
2726
gopkg.in/redis.v5 v5.2.9
2827
)

0 commit comments

Comments
 (0)