diff options
| author | 6543 <6543@obermui.de> | 2020-09-17 23:33:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-17 16:33:23 -0500 |
| commit | 06480af4723d34ac744c5f4f52fd974c3d016e59 (patch) | |
| tree | 9bfe6f0a4858b9d2c8ea482007fe969c5fe4851f /integrations/api_user_search_test.go | |
| parent | afea4faa33f9cb4a5bb42fb9798fabb3fa4ff7d3 (diff) | |
| download | gitea-06480af4723d34ac744c5f4f52fd974c3d016e59.tar.gz gitea-06480af4723d34ac744c5f4f52fd974c3d016e59.zip | |
Convert User expose ID each time (#12855)
* git blame tells me a lot of gitea things happen here around 2018, add header
* move user code int its own file
* expose user id
* adopt things from APIFormat
* fix test
* CI.restart()
Diffstat (limited to 'integrations/api_user_search_test.go')
| -rw-r--r-- | integrations/api_user_search_test.go | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/integrations/api_user_search_test.go b/integrations/api_user_search_test.go index 6661862228..c5295fbba5 100644 --- a/integrations/api_user_search_test.go +++ b/integrations/api_user_search_test.go @@ -5,9 +5,12 @@ package integrations import ( + "fmt" "net/http" "testing" + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "github.com/stretchr/testify/assert" @@ -45,8 +48,14 @@ func TestAPIUserSearchNotLoggedIn(t *testing.T) { var results SearchResults DecodeJSON(t, resp, &results) assert.NotEmpty(t, results.Data) + var modelUser *models.User for _, user := range results.Data { assert.Contains(t, user.UserName, query) - assert.Empty(t, user.Email) + modelUser = models.AssertExistsAndLoadBean(t, &models.User{ID: user.ID}).(*models.User) + if modelUser.KeepEmailPrivate { + assert.EqualValues(t, fmt.Sprintf("%s@%s", modelUser.LowerName, setting.Service.NoReplyAddress), user.Email) + } else { + assert.EqualValues(t, modelUser.Email, user.Email) + } } } |