summaryrefslogtreecommitdiffstats
path: root/integrations
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2022-08-09 23:55:29 +0200
committerGitHub <noreply@github.com>2022-08-09 23:55:29 +0200
commit89505ac650c8bce17554bc001a00673741e21528 (patch)
tree78b190f8b4ca1be67b54cd05dc2f238d98f527d1 /integrations
parent7009eb9a24a800b7fb884b54f81885815ea4d286 (diff)
downloadgitea-89505ac650c8bce17554bc001a00673741e21528.tar.gz
gitea-89505ac650c8bce17554bc001a00673741e21528.zip
Change commit status icons to SVG (#20736)
* Fix commit status popover and switch to svg icons * margin tweak * fix integration, use warning sign for error to match previous * remove fix from here, will be a new pr * use top/bottom positioning * vertically center * use no-entry over alert oction * add exclamation icon * fix test selector * more test fixes
Diffstat (limited to 'integrations')
-rw-r--r--integrations/pull_status_test.go14
-rw-r--r--integrations/repo_commits_test.go12
2 files changed, 13 insertions, 13 deletions
diff --git a/integrations/pull_status_test.go b/integrations/pull_status_test.go
index 33a27cd812..d38d90169b 100644
--- a/integrations/pull_status_test.go
+++ b/integrations/pull_status_test.go
@@ -56,11 +56,11 @@ func TestPullCreate_CommitStatus(t *testing.T) {
}
statesIcons := map[api.CommitStatusState]string{
- api.CommitStatusPending: "circle icon yellow",
- api.CommitStatusSuccess: "check icon green",
- api.CommitStatusError: "warning icon red",
- api.CommitStatusFailure: "remove icon red",
- api.CommitStatusWarning: "warning sign icon yellow",
+ api.CommitStatusPending: "octicon-dot-fill",
+ api.CommitStatusSuccess: "octicon-check",
+ api.CommitStatusError: "gitea-exclamation",
+ api.CommitStatusFailure: "octicon-x",
+ api.CommitStatusWarning: "gitea-exclamation",
}
testCtx := NewAPITestContext(t, "user1", "repo1")
@@ -80,9 +80,9 @@ func TestPullCreate_CommitStatus(t *testing.T) {
assert.NotEmpty(t, commitURL)
assert.EqualValues(t, commitID, path.Base(commitURL))
- cls, ok := doc.doc.Find("#commits-table tbody tr td.message i.commit-status").Last().Attr("class")
+ cls, ok := doc.doc.Find("#commits-table tbody tr td.message .commit-status").Last().Attr("class")
assert.True(t, ok)
- assert.EqualValues(t, "commit-status "+statesIcons[status], cls)
+ assert.Contains(t, cls, statesIcons[status])
}
})
}
diff --git a/integrations/repo_commits_test.go b/integrations/repo_commits_test.go
index 7107f43b0f..b18b35da1e 100644
--- a/integrations/repo_commits_test.go
+++ b/integrations/repo_commits_test.go
@@ -55,7 +55,7 @@ func doTestRepoCommitWithStatus(t *testing.T, state string, classes ...string) {
doc = NewHTMLParser(t, resp.Body)
// Check if commit status is displayed in message column
- sel := doc.doc.Find("#commits-table tbody tr td.message a.commit-statuses-trigger i.commit-status")
+ sel := doc.doc.Find("#commits-table tbody tr td.message a.commit-statuses-trigger .commit-status")
assert.Equal(t, 1, sel.Length())
for _, class := range classes {
assert.True(t, sel.HasClass(class))
@@ -96,21 +96,21 @@ func testRepoCommitsWithStatus(t *testing.T, resp, respOne *httptest.ResponseRec
}
func TestRepoCommitsWithStatusPending(t *testing.T) {
- doTestRepoCommitWithStatus(t, "pending", "circle", "yellow")
+ doTestRepoCommitWithStatus(t, "pending", "octicon-dot-fill", "yellow")
}
func TestRepoCommitsWithStatusSuccess(t *testing.T) {
- doTestRepoCommitWithStatus(t, "success", "check", "green")
+ doTestRepoCommitWithStatus(t, "success", "octicon-check", "green")
}
func TestRepoCommitsWithStatusError(t *testing.T) {
- doTestRepoCommitWithStatus(t, "error", "warning", "red")
+ doTestRepoCommitWithStatus(t, "error", "gitea-exclamation", "red")
}
func TestRepoCommitsWithStatusFailure(t *testing.T) {
- doTestRepoCommitWithStatus(t, "failure", "remove", "red")
+ doTestRepoCommitWithStatus(t, "failure", "octicon-x", "red")
}
func TestRepoCommitsWithStatusWarning(t *testing.T) {
- doTestRepoCommitWithStatus(t, "warning", "warning", "sign", "yellow")
+ doTestRepoCommitWithStatus(t, "warning", "gitea-exclamation", "yellow")
}