MarcoBuster/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-06-01 19:06:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

tests fix

Browse Source
This commit is contained in:
Tim-Niclas Oelschläger 2024-02-22 04:07:26 +01:00
parent 18e74749ab
commit 4dbe06eb4c
No known key found for this signature in database
3 changed files with 54 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
models/fixtures/user.yml
View File

@ -35,7 +35,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 2
@ -72,7 +72,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 3
@ -109,7 +109,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 4
@ -146,7 +146,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 5
@ -183,7 +183,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 6
@ -220,7 +220,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 7
@ -257,7 +257,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 8
@ -294,7 +294,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 9
@ -331,7 +331,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 10
@ -368,7 +368,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 11
@ -405,7 +405,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 12
@ -442,7 +442,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 13
@ -479,7 +479,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 14
@ -516,7 +516,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 15
@ -553,7 +553,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 16
@ -590,7 +590,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 17
@ -627,7 +627,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 18
@ -664,7 +664,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 19
@ -701,7 +701,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 20
@ -738,7 +738,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 21
@ -775,7 +775,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 22
@ -812,7 +812,7 @@
visibility: 1
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 23
@ -849,7 +849,7 @@
visibility: 2
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 24
@ -886,7 +886,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 25
@ -923,7 +923,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 26
@ -960,7 +960,7 @@
visibility: 0
repo_admin_change_team_access: true
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 27
@ -997,7 +997,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 28
@ -1034,7 +1034,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 29
@ -1071,7 +1071,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 30
@ -1108,7 +1108,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 31
@ -1145,7 +1145,7 @@
visibility: 2
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 32
@ -1182,7 +1182,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 33
@ -1219,7 +1219,7 @@
visibility: 1
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 34
@ -1257,7 +1257,7 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 35
@ -1294,7 +1294,7 @@
visibility: 2
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 36
@ -1331,7 +1331,7 @@
visibility: 1
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0
-
id: 37
@ -1368,4 +1368,4 @@
visibility: 0
repo_admin_change_team_access: false
theme: ""
keep_activity_private: false
actions_visibility: 0

14
models/migrations/v1_22/v287.go
View File

@ -4,16 +4,26 @@
package v1_22 //nolint
import (
"code.gitea.io/gitea/models/migrations/base"
"code.gitea.io/gitea/modules/structs"
"context"
"code.gitea.io/gitea/models/migrations/base"
"code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/structs"
"xorm.io/builder"
"xorm.io/xorm"
)
func AddActionsVisibility(x *xorm.Engine) error {
// This migration maybe rerun so that we should check if it has been run
keepActivityPrivateExits, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "user", "keep_activity_private")
if err != nil {
return err
}
if keepActivityPrivateExits {
return nil
}
sess := x.NewSession()
defer sess.Close()

10
tests/integration/privateactivity_test.go
View File

@ -48,11 +48,11 @@ func testPrivateActivityDoSomethingForActionEntries(t *testing.T) {
func testPrivateActivityHelperEnablePrivateActivity(t *testing.T) {
session := loginUser(t, privateActivityTestUser)
req := NewRequestWithValues(t, "POST", "/user/settings", map[string]string{
"_csrf": GetCSRF(t, session, "/user/settings"),
"name": privateActivityTestUser,
"email": privateActivityTestUser + "@example.com",
"language": "en-US",
"keep_activity_private": "1",
"_csrf": GetCSRF(t, session, "/user/settings"),
"name": privateActivityTestUser,
"email": privateActivityTestUser + "@example.com",
"language": "en-US",
"actions_visibility": "2",
})
session.MakeRequest(t, req, http.StatusSeeOther)
}