summaryrefslogtreecommitdiffstats
path: root/integrations
diff options
context:
space:
mode:
authorDavid Schneiderbauer <daviian@users.noreply.github.com>2018-05-15 12:07:32 +0200
committerLauris BH <lauris@nix.lv>2018-05-15 13:07:32 +0300
commit099372d76c411c598285d637bd85c9b2dbc40948 (patch)
treebce801f16b8534e2ca0dadcbc24455de95f0501c /integrations
parent1546458f7df4a4f0e77b7ae5cb65baed6feae394 (diff)
downloadgitea-099372d76c411c598285d637bd85c9b2dbc40948.tar.gz
gitea-099372d76c411c598285d637bd85c9b2dbc40948.zip
Refactor User Settings (#3900)
* moved avatar to profile page * combined password change, email and account deletion into account settings page * combined totp, access tokens, linked accounts and openid into security settings page * move access tokens to applications settings page * small change to restart drone build * fix change avatar url on profile page * redirect old settings urls to new ones * enforce only one autofocus attribute on settings pages * set correct redirect status code * fmt fix
Diffstat (limited to 'integrations')
-rw-r--r--integrations/delete_user_test.go8
-rw-r--r--integrations/links_test.go7
2 files changed, 6 insertions, 9 deletions
diff --git a/integrations/delete_user_test.go b/integrations/delete_user_test.go
index a6e44c15c0..2a5ca89860 100644
--- a/integrations/delete_user_test.go
+++ b/integrations/delete_user_test.go
@@ -43,8 +43,8 @@ func TestUserDeleteAccount(t *testing.T) {
prepareTestEnv(t)
session := loginUser(t, "user8")
- csrf := GetCSRF(t, session, "/user/settings/delete")
- urlStr := fmt.Sprintf("/user/settings/delete?password=%s", userPassword)
+ csrf := GetCSRF(t, session, "/user/settings/account")
+ urlStr := fmt.Sprintf("/user/settings/account/delete?password=%s", userPassword)
req := NewRequestWithValues(t, "POST", urlStr, map[string]string{
"_csrf": csrf,
})
@@ -58,8 +58,8 @@ func TestUserDeleteAccountStillOwnRepos(t *testing.T) {
prepareTestEnv(t)
session := loginUser(t, "user2")
- csrf := GetCSRF(t, session, "/user/settings/delete")
- urlStr := fmt.Sprintf("/user/settings/delete?password=%s", userPassword)
+ csrf := GetCSRF(t, session, "/user/settings/account")
+ urlStr := fmt.Sprintf("/user/settings/account/delete?password=%s", userPassword)
req := NewRequestWithValues(t, "POST", urlStr, map[string]string{
"_csrf": csrf,
})
diff --git a/integrations/links_test.go b/integrations/links_test.go
index b0abbd7089..803d992055 100644
--- a/integrations/links_test.go
+++ b/integrations/links_test.go
@@ -93,15 +93,12 @@ func testLinksAsUser(userName string, t *testing.T) {
"/user2?tab=stars",
"/user2?tab=activity",
"/user/settings",
- "/user/settings/avatar",
+ "/user/settings/account",
"/user/settings/security",
"/user/settings/security/two_factor/enroll",
- "/user/settings/email",
"/user/settings/keys",
- "/user/settings/applications",
- "/user/settings/account_link",
"/user/settings/organization",
- "/user/settings/delete",
+ "/user/settings/repos",
}
session := loginUser(t, userName)