mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-24 00:03:11 -05:00
df38c41c7a
- Add `recentupdated` to the `OrderByMap`. - Add integration testing for organization and user repository sorting. - Resolves #5612 - Regression from12e23ee199
where the `recentupdated` case was not added to the map, but was handled seperately as a fallback. The regression came into affect when5a0bc35799
also relied on this map but didn't handle the `recentupdated` case.
70 lines
1.7 KiB
Go
70 lines
1.7 KiB
Go
package integration
|
|
|
|
import (
|
|
"net/http"
|
|
"net/url"
|
|
"path"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/PuerkitoBio/goquery"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestRepoLastUpdatedTime(t *testing.T) {
|
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
|
user := "user2"
|
|
session := loginUser(t, user)
|
|
|
|
req := NewRequest(t, "GET", "/explore/repos?q=repo1")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
doc := NewHTMLParser(t, resp.Body)
|
|
node := doc.doc.Find(".flex-item-body").First()
|
|
{
|
|
buf := ""
|
|
findTextNonNested(t, node, &buf)
|
|
assert.Equal(t, "Updated", strings.TrimSpace(buf))
|
|
}
|
|
|
|
// Relative time should be present as a descendent
|
|
{
|
|
relativeTime := node.Find("relative-time").Text()
|
|
assert.True(t, strings.HasPrefix(relativeTime, "19")) // ~1970, might underflow with timezone
|
|
}
|
|
})
|
|
}
|
|
|
|
func TestBranchLastUpdatedTime(t *testing.T) {
|
|
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
|
user := "user2"
|
|
repo := "repo1"
|
|
session := loginUser(t, user)
|
|
|
|
req := NewRequest(t, "GET", path.Join(user, repo, "branches"))
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
doc := NewHTMLParser(t, resp.Body)
|
|
node := doc.doc.Find("p:has(span.commit-message)")
|
|
|
|
{
|
|
buf := ""
|
|
findTextNonNested(t, node, &buf)
|
|
assert.True(t, strings.Contains(buf, "Updated"))
|
|
}
|
|
|
|
{
|
|
relativeTime := node.Find("relative-time").Text()
|
|
assert.True(t, strings.HasPrefix(relativeTime, "2017"))
|
|
}
|
|
})
|
|
}
|
|
|
|
// Find all text that are direct descendents
|
|
func findTextNonNested(t *testing.T, n *goquery.Selection, buf *string) {
|
|
t.Helper()
|
|
|
|
n.Contents().Each(func(i int, s *goquery.Selection) {
|
|
if goquery.NodeName(s) == "#text" {
|
|
*buf += s.Text()
|
|
}
|
|
})
|
|
}
|