Skip to content

Commit 58371f7

Browse files
kerwin612kerwin612
committed
fix tests
1 parent a778af7 commit 58371f7

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎templates/repo/commits_list_group_by_date.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
{{else if $.Reponame}}
8181
{{$commitBaseLink = printf "%s/commit" $commitRepoLink}}
8282
{{end}}
83-
<div>
83+
<div class="commit_sign_badge">
8484
{{template "repo/commit_sign_badge" dict "Commit" . "CommitBaseLink" $commitBaseLink "CommitSignVerification" .Verification}}
8585
</div>
8686
<div class="tw-flex tw-flex-wrap tw-items-center tw-gap-2">

‎tests/integration/git_general_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ func doAutoPRMerge(baseCtx *APITestContext, dstPath string) func(t *testing.T) {
669669
doc := NewHTMLParser(t, resp.Body)
670670

671671
// Get first commit URL
672-
commitURL, exists := doc.doc.Find("#commits-table tbody tr td.sha a").Last().Attr("href")
672+
commitURL, exists := doc.doc.Find(".timeline.commits_list_group_by_date .commit_sign_badge a").Last().Attr("href")
673673
assert.True(t, exists)
674674
assert.NotEmpty(t, commitURL)
675675

‎tests/integration/pull_status_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func TestPullCreate_CommitStatus(t *testing.T) {
4545
doc := NewHTMLParser(t, resp.Body)
4646

4747
// Get first commit URL
48-
commitURL, exists := doc.doc.Find("#commits-table tbody tr td.sha a").Last().Attr("href")
48+
commitURL, exists := doc.doc.Find(".timeline.commits_list_group_by_date .commit_sign_badge a").Last().Attr("href")
4949
assert.True(t, exists)
5050
assert.NotEmpty(t, commitURL)
5151

@@ -83,12 +83,12 @@ func TestPullCreate_CommitStatus(t *testing.T) {
8383
resp = session.MakeRequest(t, req, http.StatusOK)
8484
doc = NewHTMLParser(t, resp.Body)
8585

86-
commitURL, exists = doc.doc.Find("#commits-table tbody tr td.sha a").Last().Attr("href")
86+
commitURL, exists = doc.doc.Find(".timeline.commits_list_group_by_date .commit_sign_badge a").Last().Attr("href")
8787
assert.True(t, exists)
8888
assert.NotEmpty(t, commitURL)
8989
assert.Equal(t, commitID, path.Base(commitURL))
9090

91-
cls, ok := doc.doc.Find("#commits-table tbody tr td.message .commit-status").Last().Attr("class")
91+
cls, ok := doc.doc.Find(".timeline.commits_list_group_by_date .description .commit-status").Last().Attr("class")
9292
assert.True(t, ok)
9393
assert.Contains(t, cls, statesIcons[status])
9494
}

‎tests/integration/repo_commits_search_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func testRepoCommitsSearch(t *testing.T, query, commit string) {
2222
resp := session.MakeRequest(t, req, http.StatusOK)
2323

2424
doc := NewHTMLParser(t, resp.Body)
25-
sel := doc.doc.Find("#commits-table tbody tr td.sha a")
25+
sel := doc.doc.Find(".timeline.commits_list_group_by_date .commit_sign_badge a")
2626
assert.Equal(t, commit, strings.TrimSpace(sel.Text()))
2727
}
2828

‎tests/integration/repo_commits_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestRepoCommits(t *testing.T) {
3333
resp := session.MakeRequest(t, req, http.StatusOK)
3434

3535
doc := NewHTMLParser(t, resp.Body)
36-
commitURL, exists := doc.doc.Find("#commits-table .commit-id-short").Attr("href")
36+
commitURL, exists := doc.doc.Find(".timeline.commits_list_group_by_date .commit_sign_badge .commit-id-short").Attr("href")
3737
assert.True(t, exists)
3838
assert.NotEmpty(t, commitURL)
3939
}
@@ -50,7 +50,7 @@ func Test_ReposGitCommitListNotMaster(t *testing.T) {
5050

5151
doc := NewHTMLParser(t, resp.Body)
5252
commits := []string{}
53-
doc.doc.Find("#commits-table .commit-id-short").Each(func(i int, s *goquery.Selection) {
53+
doc.doc.Find(".timeline.commits_list_group_by_date .commit_sign_badge .commit-id-short").Each(func(i int, s *goquery.Selection) {
5454
commitURL, exists := s.Attr("href")
5555
assert.True(t, exists)
5656
assert.NotEmpty(t, commitURL)
@@ -63,7 +63,7 @@ func Test_ReposGitCommitListNotMaster(t *testing.T) {
6363
assert.Equal(t, "5099b81332712fe655e34e8dd63574f503f61811", commits[2])
6464

6565
userNames := []string{}
66-
doc.doc.Find("#commits-table .author-wrapper").Each(func(i int, s *goquery.Selection) {
66+
doc.doc.Find(".timeline.commits_list_group_by_date .description .author-wrapper").Each(func(i int, s *goquery.Selection) {
6767
userPath, exists := s.Attr("href")
6868
assert.True(t, exists)
6969
assert.NotEmpty(t, userPath)
@@ -87,7 +87,7 @@ func doTestRepoCommitWithStatus(t *testing.T, state string, classes ...string) {
8787

8888
doc := NewHTMLParser(t, resp.Body)
8989
// Get first commit URL
90-
commitURL, exists := doc.doc.Find("#commits-table .commit-id-short").Attr("href")
90+
commitURL, exists := doc.doc.Find(".timeline.commits_list_group_by_date .commit_sign_badge .commit-id-short").Attr("href")
9191
assert.True(t, exists)
9292
assert.NotEmpty(t, commitURL)
9393

@@ -105,7 +105,7 @@ func doTestRepoCommitWithStatus(t *testing.T, state string, classes ...string) {
105105

106106
doc = NewHTMLParser(t, resp.Body)
107107
// Check if commit status is displayed in message column (.tippy-target to ignore the tippy trigger)
108-
sel := doc.doc.Find("#commits-table .message .tippy-target .commit-status")
108+
sel := doc.doc.Find(".timeline.commits_list_group_by_date .description .tippy-target .commit-status")
109109
assert.Equal(t, 1, sel.Length())
110110
for _, class := range classes {
111111
assert.True(t, sel.HasClass(class))
@@ -181,7 +181,7 @@ func TestRepoCommitsStatusParallel(t *testing.T) {
181181

182182
doc := NewHTMLParser(t, resp.Body)
183183
// Get first commit URL
184-
commitURL, exists := doc.doc.Find("#commits-table .commit-id-short").Attr("href")
184+
commitURL, exists := doc.doc.Find(".timeline.commits_list_group_by_date .commit_sign_badge .commit-id-short").Attr("href")
185185
assert.True(t, exists)
186186
assert.NotEmpty(t, commitURL)
187187

@@ -216,7 +216,7 @@ func TestRepoCommitsStatusMultiple(t *testing.T) {
216216

217217
doc := NewHTMLParser(t, resp.Body)
218218
// Get first commit URL
219-
commitURL, exists := doc.doc.Find("#commits-table .commit-id-short").Attr("href")
219+
commitURL, exists := doc.doc.Find(".timeline.commits_list_group_by_date .commit_sign_badge .commit-id-short").Attr("href")
220220
assert.True(t, exists)
221221
assert.NotEmpty(t, commitURL)
222222

@@ -241,6 +241,6 @@ func TestRepoCommitsStatusMultiple(t *testing.T) {
241241

242242
doc = NewHTMLParser(t, resp.Body)
243243
// Check that the data-global-init="initCommitStatuses" (for trigger) and commit-status (svg) are present
244-
sel := doc.doc.Find(`#commits-table .message [data-global-init="initCommitStatuses"] .commit-status`)
244+
sel := doc.doc.Find(`.timeline.commits_list_group_by_date .description [data-global-init="initCommitStatuses"] .commit-status`)
245245
assert.Equal(t, 1, sel.Length())
246246
}

‎tests/integration/view_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ func TestCommitListActions(t *testing.T) {
4848
resp := session.MakeRequest(t, req, http.StatusOK)
4949
htmlDoc := NewHTMLParser(t, resp.Body)
5050

51-
AssertHTMLElement(t, htmlDoc, `.commit-list .copy-commit-id`, true)
52-
AssertHTMLElement(t, htmlDoc, `.commit-list .view-single-diff`, false)
53-
AssertHTMLElement(t, htmlDoc, `.commit-list .view-commit-path`, true)
51+
AssertHTMLElement(t, htmlDoc, `.timeline.commits_list_group_by_date .copy-commit-id`, true)
52+
AssertHTMLElement(t, htmlDoc, `.timeline.commits_list_group_by_date .view-single-diff`, false)
53+
AssertHTMLElement(t, htmlDoc, `.timeline.commits_list_group_by_date .view-commit-path`, true)
5454
})
5555

5656
t.Run("RepoFileHistory", func(t *testing.T) {
@@ -60,8 +60,8 @@ func TestCommitListActions(t *testing.T) {
6060
resp := session.MakeRequest(t, req, http.StatusOK)
6161
htmlDoc := NewHTMLParser(t, resp.Body)
6262

63-
AssertHTMLElement(t, htmlDoc, `.commit-list .copy-commit-id`, true)
64-
AssertHTMLElement(t, htmlDoc, `.commit-list .view-single-diff`, true)
65-
AssertHTMLElement(t, htmlDoc, `.commit-list .view-commit-path`, true)
63+
AssertHTMLElement(t, htmlDoc, `.timeline.commits_list_group_by_date .copy-commit-id`, true)
64+
AssertHTMLElement(t, htmlDoc, `.timeline.commits_list_group_by_date .view-single-diff`, true)
65+
AssertHTMLElement(t, htmlDoc, `.timeline.commits_list_group_by_date .view-commit-path`, true)
6666
})
6767
}

0 commit comments

Comments
 (0)