mirrors/remark42
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rollback proxy mock

Browse Source
This commit is contained in:
Umputun
2018-06-19 00:16:18 -05:00
parent 7d953247ad
commit 47586e372e
2 changed files with 3 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/rest/auth/provider_test.go
+3 -8
View File
@@ -12,11 +12,9 @@ import (
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"golang.org/x/oauth2"
"github.com/umputun/remark/app/rest/proxy"
"github.com/umputun/remark/app/store"
)
@@ -51,7 +49,7 @@ func TestLogin(t *testing.T) {
u := store.User{}
err = json.Unmarshal(body, &u)
assert.Nil(t, err)
assert.Equal(t, store.User{Name: "blah", ID: "mock_myuser1", Picture: "/v1/avatar/23/pic1.png",
assert.Equal(t, store.User{Name: "blah", ID: "mock_myuser1", Picture: "http://exmple.com/pic1.png",
Admin: false, Blocked: false, IP: ""}, u)
// check admin user
@@ -62,7 +60,7 @@ func TestLogin(t *testing.T) {
assert.Nil(t, err)
err = json.Unmarshal(body, &u)
assert.Nil(t, err)
assert.Equal(t, store.User{Name: "blah", ID: "mock_myuser2", Picture: "/v1/avatar/23/pic1.png",
assert.Equal(t, store.User{Name: "blah", ID: "mock_myuser2", Picture: "http://exmple.com/pic1.png",
Admin: true, Blocked: false, IP: "", Verified: true}, u)
}
@@ -161,12 +159,9 @@ func mockProvider(t *testing.T, loginPort, authPort int) (*http.Server, *http.Se
},
}
mockAvatarStore := proxy.MockAvatarStore{}
mockAvatarStore.On("Put", mock.Anything, mock.Anything).Return("23/pic1.png", nil)
params := Params{RemarkURL: "url", SecretKey: "123456", Cid: "cid", Csecret: "csecret",
JwtService: NewJWT("12345", false, time.Hour), Admins: []string{"mock_myuser2"},
AvatarProxy: &proxy.Avatar{Store: &mockAvatarStore, RoutePath: "/v1/avatar"},
// AvatarProxy: &proxy.Avatar{Store: &mockAvatarStore, RoutePath: "/v1/avatar"},
IsVerifiedFn: func(siteID, userID string) bool { return userID == "mock_myuser2" }}
provider = initProvider(params, provider)
app/rest/proxy/avatar_store_mock.go
-61
View File
@@ -1,61 +0,0 @@
// Code generated by mockery v1.0.0. DO NOT EDIT.
package proxy
import io "io"
import mock "github.com/stretchr/testify/mock"
// MockAvatarStore is an autogenerated mock type for the AvatarStore type
type MockAvatarStore struct {
mock.Mock
}
// Get provides a mock function with given fields: avatar
func (_m *MockAvatarStore) Get(avatar string) (io.ReadCloser, int, error) {
ret := _m.Called(avatar)
var r0 io.ReadCloser
if rf, ok := ret.Get(0).(func(string) io.ReadCloser); ok {
r0 = rf(avatar)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(io.ReadCloser)
}
}
var r1 int
if rf, ok := ret.Get(1).(func(string) int); ok {
r1 = rf(avatar)
} else {
r1 = ret.Get(1).(int)
}
var r2 error
if rf, ok := ret.Get(2).(func(string) error); ok {
r2 = rf(avatar)
} else {
r2 = ret.Error(2)
}
return r0, r1, r2
}
// Put provides a mock function with given fields: userID, reader
func (_m *MockAvatarStore) Put(userID string, reader io.Reader) (string, error) {
ret := _m.Called(userID, reader)
var r0 string
if rf, ok := ret.Get(0).(func(string, io.Reader) string); ok {
r0 = rf(userID, reader)
} else {
r0 = ret.Get(0).(string)
}
var r1 error
if rf, ok := ret.Get(1).(func(string, io.Reader) error); ok {
r1 = rf(userID, reader)
} else {
r1 = ret.Error(1)
}
return r0, r1
}