alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '103' into 'master'

Browse Source 
Ensure app exists before listing its routes

Closes #103

See merge request !106
This commit is contained in:
Reed Allman
2017-07-25 10:16:07 -07:00
parent 5ea70791a5 5ed3e79b63
commit e0569192ee
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/server/routes_test.go
View File

@@ -115,6 +115,9 @@ func TestRoutePut(t *testing.T) {
func TestRouteDelete(t *testing.T) {
buf := setLogBuffer()
routes := models.Routes{{AppName: "a", Path: "/myroute"}}
apps := models.Apps{{Name: "a", Routes: routes, Config: nil}}
for i, test := range []struct {
ds models.Datastore
logDB models.FnLog
@@ -124,11 +127,7 @@ func TestRouteDelete(t *testing.T) {
expectedError error
}{
{datastore.NewMock(), logs.NewMock(), "/v1/apps/a/routes/missing", "", http.StatusNotFound, models.ErrRoutesNotFound},
{datastore.NewMockInit(nil,
[]*models.Route{
{Path: "/myroute", AppName: "a"},
}, nil, nil,
), logs.NewMock(), "/v1/apps/a/routes/myroute", "", http.StatusOK, nil},
{datastore.NewMockInit(apps, routes, nil, nil), logs.NewMock(), "/v1/apps/a/routes/myroute", "", http.StatusOK, nil},
} {
rnr, cancel := testRunner(t)
srv := testServer(test.ds, &mqs.Mock{}, test.logDB, rnr, DefaultEnqueue)
@@ -170,7 +169,7 @@ func TestRouteList(t *testing.T) {
expectedCode int
expectedError error
}{
{"/v1/apps/a/routes", "", http.StatusOK, nil},
{"/v1/apps/a/routes", "", http.StatusNotFound, models.ErrAppsNotFound},
} {
_, rec := routerRequest(t, srv.Router, "GET", test.path, nil)