Skip to content

Commit

Permalink
fix #1643 and improve integration test (#1645)
Browse files Browse the repository at this point in the history
  • Loading branch information
lunny authored and appleboy committed Apr 30, 2017
1 parent 00324ce commit 0308d44
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 10 deletions.
9 changes: 9 additions & 0 deletions integrations/api_repo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,12 @@ func TestAPIUserReposNotLogin(t *testing.T) {
resp := MakeRequest(req)
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
}

func TestAPISearchRepoNotLogin(t *testing.T) {
assert.NoError(t, models.LoadFixtures())

req, err := http.NewRequest("GET", "/api/v1/repos/search?q=Test", nil)
assert.NoError(t, err)
resp := MakeRequest(req)
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
}
9 changes: 0 additions & 9 deletions integrations/view_test.go → integrations/repo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,3 @@ func TestViewRepo(t *testing.T) {
resp := MakeRequest(req)
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
}

func TestViewUser(t *testing.T) {
prepareTestEnv(t)

req, err := http.NewRequest("GET", "/user2", nil)
assert.NoError(t, err)
resp := MakeRequest(req)
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
}
21 changes: 21 additions & 0 deletions integrations/user_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright 2017 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.

package integrations

import (
"net/http"
"testing"

"github.com/stretchr/testify/assert"
)

func TestViewUser(t *testing.T) {
prepareTestEnv(t)

req, err := http.NewRequest("GET", "/user2", nil)
assert.NoError(t, err)
resp := MakeRequest(req)
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
}
7 changes: 6 additions & 1 deletion routers/api/v1/repo/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ func Search(ctx *context.APIContext) {
return
}

var userID int64
if ctx.IsSigned {
userID = ctx.User.ID
}

results := make([]*api.Repository, len(repos))
for i, repo := range repos {
if err = repo.GetOwner(); err != nil {
Expand All @@ -64,7 +69,7 @@ func Search(ctx *context.APIContext) {
})
return
}
accessMode, err := models.AccessLevel(ctx.User.ID, repo)
accessMode, err := models.AccessLevel(userID, repo)
if err != nil {
ctx.JSON(500, map[string]interface{}{
"ok": false,
Expand Down

0 comments on commit 0308d44

Please sign in to comment.