diff options
| author | Lanre Adelowo <adelowomailbox@gmail.com> | 2019-02-19 15:11:50 +0100 |
|---|---|---|
| committer | techknowlogick <matti@mdranta.net> | 2019-02-19 09:11:50 -0500 |
| commit | 094263db4d9f1b53c4b4c021005eec07baddd253 (patch) | |
| tree | 69d47554792a96e3dd13fdfd8c28cfb30ac462f8 /integrations | |
| parent | ff2be17e3f2e4cf8e756796574cdd72d349fa19b (diff) | |
| download | gitea-094263db4d9f1b53c4b4c021005eec07baddd253.tar.gz gitea-094263db4d9f1b53c4b4c021005eec07baddd253.zip | |
Show email if the authenticated user owns the profile page being requested for (#4981)
* Show email if the authenticated user owns the profile page being
requested for.
Also removed `setting.UI.ShowUserEmail` as it's documentation says it
only controls the email setting on the explore page
* fix current user check... This prevents a panic as a user must be signed in before ctx.User is called
* fix panic in tests
* try to fix tests
* Update year
* Test CI fail
* Revert change
* User 3 is not allowed to authorize
* Set user2 email to be private
* Change to user4 in explore page as user2 now has private email option set
Diffstat (limited to 'integrations')
| -rw-r--r-- | integrations/setting_test.go | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/integrations/setting_test.go b/integrations/setting_test.go index 2aac8e90ed..54f4fded66 100644 --- a/integrations/setting_test.go +++ b/integrations/setting_test.go @@ -25,7 +25,7 @@ func TestSettingShowUserEmailExplore(t *testing.T) { htmlDoc := NewHTMLParser(t, resp.Body) assert.Contains(t, htmlDoc.doc.Find(".ui.user.list").Text(), - "user2@example.com", + "user4@example.com", ) setting.UI.ShowUserEmail = false @@ -35,7 +35,7 @@ func TestSettingShowUserEmailExplore(t *testing.T) { htmlDoc = NewHTMLParser(t, resp.Body) assert.NotContains(t, htmlDoc.doc.Find(".ui.user.list").Text(), - "user2@example.com", + "user4@example.com", ) setting.UI.ShowUserEmail = showUserEmail @@ -61,12 +61,23 @@ func TestSettingShowUserEmailProfile(t *testing.T) { req = NewRequest(t, "GET", "/user2") resp = session.MakeRequest(t, req, http.StatusOK) htmlDoc = NewHTMLParser(t, resp.Body) - assert.NotContains(t, + // Should contain since this user owns the profile page + assert.Contains(t, htmlDoc.doc.Find(".user.profile").Text(), "user2@example.com", ) setting.UI.ShowUserEmail = showUserEmail + + session = loginUser(t, "user4") + req = NewRequest(t, "GET", "/user2") + resp = session.MakeRequest(t, req, http.StatusOK) + htmlDoc = NewHTMLParser(t, resp.Body) + assert.NotContains(t, + htmlDoc.doc.Find(".user.profile").Text(), + "user2@example.com", + ) + } func TestSettingLandingPage(t *testing.T) { |