Skip to content

Commit c829df0

Browse files
wxiaoguangwxiaoguang
committed
fix tests
1 parent ee806d6 commit c829df0

File tree

2 files changed

+48
-79
lines changed

2 files changed

+48
-79
lines changed

‎tests/integration/api_fork_test.go‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -31,48 +31,34 @@ func TestAPIForkListLimitedAndPrivateRepos(t *testing.T) {
3131

3232
user1Sess := loginUser(t, "user1")
3333
user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user1"})
34+
35+
// fork into a limited org
3436
limitedOrg := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 22})
3537
assert.EqualValues(t, structs.VisibleTypeLimited, limitedOrg.Visibility)
36-
3738
ownerTeam1, err := org_model.OrgFromUser(limitedOrg).GetOwnerTeam(db.DefaultContext)
3839
assert.NoError(t, err)
3940
assert.NoError(t, models.AddTeamMember(db.DefaultContext, ownerTeam1, user1))
40-
defer func() {
41-
models.RemoveTeamMember(db.DefaultContext, ownerTeam1, user1)
42-
}()
43-
44-
user1Token := getTokenForLoggedInUser(t, user1Sess,
45-
auth_model.AccessTokenScopeWriteRepository,
46-
auth_model.AccessTokenScopeWriteOrganization)
47-
41+
user1Token := getTokenForLoggedInUser(t, user1Sess, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteOrganization)
4842
req := NewRequestWithJSON(t, "POST", "/api/v1/repos/user2/repo1/forks", &api.CreateForkOption{
4943
Organization: &limitedOrg.Name,
5044
}).AddTokenAuth(user1Token)
5145
MakeRequest(t, req, http.StatusAccepted)
5246

47+
// fork into a private org
5348
user4Sess := loginUser(t, "user4")
5449
user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user4"})
55-
5650
privateOrg := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 23})
5751
assert.EqualValues(t, structs.VisibleTypePrivate, privateOrg.Visibility)
58-
5952
ownerTeam2, err := org_model.OrgFromUser(privateOrg).GetOwnerTeam(db.DefaultContext)
6053
assert.NoError(t, err)
6154
assert.NoError(t, models.AddTeamMember(db.DefaultContext, ownerTeam2, user4))
62-
defer func() {
63-
models.RemoveTeamMember(db.DefaultContext, ownerTeam2, user4)
64-
}()
65-
66-
user4Token := getTokenForLoggedInUser(t, user4Sess,
67-
auth_model.AccessTokenScopeWriteRepository,
68-
auth_model.AccessTokenScopeWriteOrganization)
69-
55+
user4Token := getTokenForLoggedInUser(t, user4Sess, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteOrganization)
7056
req = NewRequestWithJSON(t, "POST", "/api/v1/repos/user2/repo1/forks", &api.CreateForkOption{
7157
Organization: &privateOrg.Name,
7258
}).AddTokenAuth(user4Token)
7359
MakeRequest(t, req, http.StatusAccepted)
7460

75-
t.Run("Anomynous", func(t *testing.T) {
61+
t.Run("Anonymous", func(t *testing.T) {
7662
defer tests.PrintCurrentTest(t)()
7763

7864
req := NewRequest(t, "GET", "/api/v1/repos/user2/repo1/forks")
@@ -98,9 +84,6 @@ func TestAPIForkListLimitedAndPrivateRepos(t *testing.T) {
9884
assert.EqualValues(t, "1", resp.Header().Get("X-Total-Count"))
9985

10086
assert.NoError(t, models.AddTeamMember(db.DefaultContext, ownerTeam2, user1))
101-
defer func() {
102-
models.RemoveTeamMember(db.DefaultContext, ownerTeam2, user1)
103-
}()
10487

10588
req = NewRequest(t, "GET", "/api/v1/repos/user2/repo1/forks").AddTokenAuth(user1Token)
10689
resp = MakeRequest(t, req, http.StatusOK)

‎tests/integration/repo_fork_test.go‎

Lines changed: 42 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"fmt"
88
"net/http"
99
"net/http/httptest"
10-
"net/url"
1110
"testing"
1211

1312
"code.gitea.io/gitea/models"
@@ -81,62 +80,49 @@ func TestRepoForkToOrg(t *testing.T) {
8180
}
8281

8382
func TestForkListLimitedAndPrivateRepos(t *testing.T) {
83+
defer tests.PrepareTestEnv(t)()
8484
forkItemSelector := ".tw-flex.tw-items-center.tw-py-2"
8585

86-
onGiteaRun(t, func(t *testing.T, u *url.URL) {
87-
user1Sess := loginUser(t, "user1")
88-
user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user1"})
89-
limitedOrg := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 22})
90-
assert.EqualValues(t, structs.VisibleTypeLimited, limitedOrg.Visibility)
91-
92-
ownerTeam1, err := org_model.OrgFromUser(limitedOrg).GetOwnerTeam(db.DefaultContext)
93-
assert.NoError(t, err)
94-
assert.NoError(t, models.AddTeamMember(db.DefaultContext, ownerTeam1, user1))
95-
defer func() {
96-
models.RemoveTeamMember(db.DefaultContext, ownerTeam1, user1)
97-
}()
98-
99-
testRepoFork(t, user1Sess, "user2", "repo1", limitedOrg.Name, "repo1", "")
100-
101-
user4Sess := loginUser(t, "user4")
102-
user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user4"})
103-
104-
privateOrg := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 23})
105-
assert.EqualValues(t, structs.VisibleTypePrivate, privateOrg.Visibility)
106-
107-
ownerTeam2, err := org_model.OrgFromUser(privateOrg).GetOwnerTeam(db.DefaultContext)
108-
assert.NoError(t, err)
109-
assert.NoError(t, models.AddTeamMember(db.DefaultContext, ownerTeam2, user4))
110-
defer func() {
111-
models.RemoveTeamMember(db.DefaultContext, ownerTeam2, user4)
112-
}()
113-
114-
testRepoFork(t, user4Sess, "user2", "repo1", privateOrg.Name, "repo1", "")
115-
116-
t.Run("Anomynous", func(t *testing.T) {
117-
defer tests.PrintCurrentTest(t)()
118-
119-
req := NewRequest(t, "GET", "/user2/repo1/forks")
120-
resp := MakeRequest(t, req, http.StatusOK)
121-
htmlDoc := NewHTMLParser(t, resp.Body)
122-
assert.EqualValues(t, 0, htmlDoc.Find(forkItemSelector).Length())
123-
})
124-
125-
t.Run("Logged in", func(t *testing.T) {
126-
defer tests.PrintCurrentTest(t)()
127-
128-
req := NewRequest(t, "GET", "/user2/repo1/forks")
129-
resp := user1Sess.MakeRequest(t, req, http.StatusOK)
130-
htmlDoc := NewHTMLParser(t, resp.Body)
131-
assert.EqualValues(t, 1, htmlDoc.Find(forkItemSelector).Length())
132-
133-
assert.NoError(t, models.AddTeamMember(db.DefaultContext, ownerTeam2, user1))
134-
defer func() {
135-
models.RemoveTeamMember(db.DefaultContext, ownerTeam2, user1)
136-
}()
137-
resp = user1Sess.MakeRequest(t, req, http.StatusOK)
138-
htmlDoc = NewHTMLParser(t, resp.Body)
139-
assert.EqualValues(t, 2, htmlDoc.Find(forkItemSelector).Length())
140-
})
86+
user1Sess := loginUser(t, "user1")
87+
user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user1"})
88+
89+
// fork to a limited org
90+
limitedOrg := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 22})
91+
assert.EqualValues(t, structs.VisibleTypeLimited, limitedOrg.Visibility)
92+
ownerTeam1, err := org_model.OrgFromUser(limitedOrg).GetOwnerTeam(db.DefaultContext)
93+
assert.NoError(t, err)
94+
assert.NoError(t, models.AddTeamMember(db.DefaultContext, ownerTeam1, user1))
95+
testRepoFork(t, user1Sess, "user2", "repo1", limitedOrg.Name, "repo1", "")
96+
97+
// fork to a private org
98+
user4Sess := loginUser(t, "user4")
99+
user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user4"})
100+
privateOrg := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 23})
101+
assert.EqualValues(t, structs.VisibleTypePrivate, privateOrg.Visibility)
102+
ownerTeam2, err := org_model.OrgFromUser(privateOrg).GetOwnerTeam(db.DefaultContext)
103+
assert.NoError(t, err)
104+
assert.NoError(t, models.AddTeamMember(db.DefaultContext, ownerTeam2, user4))
105+
testRepoFork(t, user4Sess, "user2", "repo1", privateOrg.Name, "repo1", "")
106+
107+
t.Run("Anonymous", func(t *testing.T) {
108+
defer tests.PrintCurrentTest(t)()
109+
req := NewRequest(t, "GET", "/user2/repo1/forks")
110+
resp := MakeRequest(t, req, http.StatusOK)
111+
htmlDoc := NewHTMLParser(t, resp.Body)
112+
assert.EqualValues(t, 0, htmlDoc.Find(forkItemSelector).Length())
113+
})
114+
115+
t.Run("Logged in", func(t *testing.T) {
116+
defer tests.PrintCurrentTest(t)()
117+
118+
req := NewRequest(t, "GET", "/user2/repo1/forks")
119+
resp := user1Sess.MakeRequest(t, req, http.StatusOK)
120+
htmlDoc := NewHTMLParser(t, resp.Body)
121+
assert.EqualValues(t, 1, htmlDoc.Find(forkItemSelector).Length())
122+
123+
assert.NoError(t, models.AddTeamMember(db.DefaultContext, ownerTeam2, user1))
124+
resp = user1Sess.MakeRequest(t, req, http.StatusOK)
125+
htmlDoc = NewHTMLParser(t, resp.Body)
126+
assert.EqualValues(t, 2, htmlDoc.Find(forkItemSelector).Length())
141127
})
142128
}

0 commit comments

Comments
 (0)