Skip to content

Commit 0ed7ec9

Browse files
committed
Integration test for activity page
1 parent 4ccb0fe commit 0ed7ec9

File tree

4 files changed

+68
-12
lines changed

4 files changed

+68
-12
lines changed

integrations/editor_test.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
8989

9090
}
9191

92-
func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePath string) *TestResponse {
93-
94-
newContent := "Hello, World (Edited)\n"
95-
92+
func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePath, newContent string) *TestResponse {
9693
// Get to the 'edit this file' page
9794
req := NewRequest(t, "GET", path.Join(user, repo, "_edit", branch, filePath))
9895
resp := session.MakeRequest(t, req, http.StatusOK)
@@ -121,9 +118,7 @@ func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePa
121118
return resp
122119
}
123120

124-
func testEditFileToNewBranch(t *testing.T, session *TestSession, user, repo, branch, targetBranch, filePath string) *TestResponse {
125-
126-
newContent := "Hello, World (Edited)\n"
121+
func testEditFileToNewBranch(t *testing.T, session *TestSession, user, repo, branch, targetBranch, filePath, newContent string) *TestResponse {
127122

128123
// Get to the 'edit this file' page
129124
req := NewRequest(t, "GET", path.Join(user, repo, "_edit", branch, filePath))
@@ -157,11 +152,11 @@ func testEditFileToNewBranch(t *testing.T, session *TestSession, user, repo, bra
157152
func TestEditFile(t *testing.T) {
158153
prepareTestEnv(t)
159154
session := loginUser(t, "user2")
160-
testEditFile(t, session, "user2", "repo1", "master", "README.md")
155+
testEditFile(t, session, "user2", "repo1", "master", "README.md", "Hello, World (Edited)\n")
161156
}
162157

163158
func TestEditFileToNewBranch(t *testing.T) {
164159
prepareTestEnv(t)
165160
session := loginUser(t, "user2")
166-
testEditFileToNewBranch(t, session, "user2", "repo1", "master", "feature/test", "README.md")
161+
testEditFileToNewBranch(t, session, "user2", "repo1", "master", "feature/test", "README.md", "Hello, World (Edited)\n")
167162
}

integrations/pull_create_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ func TestPullCreate(t *testing.T) {
4747
prepareTestEnv(t)
4848
session := loginUser(t, "user1")
4949
testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
50-
testEditFile(t, session, "user1", "repo1", "master", "README.md")
50+
testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
5151
testPullCreate(t, session, "user1", "repo1", "master")
5252
}

integrations/pull_merge_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestPullMerge(t *testing.T) {
4949
prepareTestEnv(t)
5050
session := loginUser(t, "user1")
5151
testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
52-
testEditFile(t, session, "user1", "repo1", "master", "README.md")
52+
testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
5353

5454
resp := testPullCreate(t, session, "user1", "repo1", "master")
5555

@@ -62,7 +62,7 @@ func TestPullCleanUpAfterMerge(t *testing.T) {
6262
prepareTestEnv(t)
6363
session := loginUser(t, "user1")
6464
testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
65-
testEditFileToNewBranch(t, session, "user1", "repo1", "master", "feature/test", "README.md")
65+
testEditFileToNewBranch(t, session, "user1", "repo1", "master", "feature/test", "README.md", "Hello, World (Edited)\n")
6666

6767
resp := testPullCreate(t, session, "user1", "repo1", "feature/test")
6868

integrations/repo_activity_test.go

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
// Copyright 2017 The Gitea Authors. All rights reserved.
2+
// Use of this source code is governed by a MIT-style
3+
// license that can be found in the LICENSE file.
4+
5+
package integrations
6+
7+
import (
8+
"net/http"
9+
"strings"
10+
"testing"
11+
12+
"github.com/stretchr/testify/assert"
13+
)
14+
15+
func TestRepoActivity(t *testing.T) {
16+
prepareTestEnv(t)
17+
session := loginUser(t, "user1")
18+
19+
// Create PRs (1 merged & 2 proposed)
20+
testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
21+
testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
22+
resp := testPullCreate(t, session, "user1", "repo1", "master")
23+
elem := strings.Split(RedirectURL(t, resp), "/")
24+
assert.EqualValues(t, "pulls", elem[3])
25+
testPullMerge(t, session, elem[1], elem[2], elem[4])
26+
27+
testEditFileToNewBranch(t, session, "user1", "repo1", "master", "feat/better_readme", "README.md", "Hello, World (Edited Again)\n")
28+
testPullCreate(t, session, "user1", "repo1", "feat/better_readme")
29+
30+
testEditFileToNewBranch(t, session, "user1", "repo1", "master", "feat/much_better_readme", "README.md", "Hello, World (Edited More)\n")
31+
testPullCreate(t, session, "user1", "repo1", "feat/much_better_readme")
32+
33+
// Create issues (3 new issues)
34+
testNewIssue(t, session, "user2", "repo1", "Issue 1")
35+
testNewIssue(t, session, "user2", "repo1", "Issue 2")
36+
testNewIssue(t, session, "user2", "repo1", "Issue 3")
37+
38+
// Create releases (1 new release)
39+
createNewRelease(t, session, "/user2/repo1", "v1.0.0", "v1.0.0", false, false)
40+
41+
// Open Activity page and check stats
42+
req := NewRequest(t, "GET", "/user2/repo1/activity")
43+
resp = session.MakeRequest(t, req, http.StatusOK)
44+
htmlDoc := NewHTMLParser(t, resp.Body)
45+
46+
// Should be 1 published release
47+
list := htmlDoc.doc.Find("#published-releases").Next().Find("p.desc")
48+
assert.Len(t, list.Nodes, 1)
49+
50+
// Should be 1 merged pull request
51+
list = htmlDoc.doc.Find("#merged-pull-requests").Next().Find("p.desc")
52+
assert.Len(t, list.Nodes, 1)
53+
54+
// Should be 2 merged proposed pull requests
55+
list = htmlDoc.doc.Find("#proposed-pull-requests").Next().Find("p.desc")
56+
assert.Len(t, list.Nodes, 2)
57+
58+
// Should be 3 new issues
59+
list = htmlDoc.doc.Find("#new-issues").Next().Find("p.desc")
60+
assert.Len(t, list.Nodes, 3)
61+
}

0 commit comments

Comments
 (0)