mirror of
https://github.com/go-gitea/gitea.git
synced 2026-05-14 17:27:39 +02:00
run formatter and linter
This commit is contained in:
parent
36b6470548
commit
ae6716d13c
@ -16,11 +16,10 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
group_model "code.gitea.io/gitea/models/group"
|
|
||||||
|
|
||||||
asymkey_model "code.gitea.io/gitea/models/asymkey"
|
asymkey_model "code.gitea.io/gitea/models/asymkey"
|
||||||
"code.gitea.io/gitea/models/db"
|
"code.gitea.io/gitea/models/db"
|
||||||
git_model "code.gitea.io/gitea/models/git"
|
git_model "code.gitea.io/gitea/models/git"
|
||||||
|
group_model "code.gitea.io/gitea/models/group"
|
||||||
issues_model "code.gitea.io/gitea/models/issues"
|
issues_model "code.gitea.io/gitea/models/issues"
|
||||||
access_model "code.gitea.io/gitea/models/perm/access"
|
access_model "code.gitea.io/gitea/models/perm/access"
|
||||||
repo_model "code.gitea.io/gitea/models/repo"
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
|
|||||||
@ -37,25 +37,33 @@ func TestOrg(t *testing.T) {
|
|||||||
func testOrgRepos(t *testing.T) {
|
func testOrgRepos(t *testing.T) {
|
||||||
var (
|
var (
|
||||||
users = []string{"user1", "user2"}
|
users = []string{"user1", "user2"}
|
||||||
cases = map[string][]string{
|
cases = map[string]map[string][]string{
|
||||||
"alphabetically": {"repo21", "repo3", "repo5"},
|
"129": {
|
||||||
"reversealphabetically": {"repo5", "repo3", "repo21"},
|
"alphabetically": {"repo21", "repo3"},
|
||||||
|
"reversealphabetically": {"repo3", "repo21"},
|
||||||
|
},
|
||||||
|
"139": {
|
||||||
|
"alphabetically": {"repo5"},
|
||||||
|
"reversealphabetically": {"repo5"},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
for _, user := range users {
|
for _, user := range users {
|
||||||
t.Run(user, func(t *testing.T) {
|
t.Run(user, func(t *testing.T) {
|
||||||
session := loginUser(t, user)
|
session := loginUser(t, user)
|
||||||
for sortBy, repos := range cases {
|
for group, groupCases := range cases {
|
||||||
req := NewRequest(t, "GET", "/org3?sort="+sortBy)
|
for sortBy, repos := range groupCases {
|
||||||
resp := session.MakeRequest(t, req, http.StatusOK)
|
req := NewRequest(t, "GET", "/org3/groups/"+group+"?sort="+sortBy)
|
||||||
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
||||||
|
|
||||||
htmlDoc := NewHTMLParser(t, resp.Body)
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
||||||
|
|
||||||
sel := htmlDoc.doc.Find("a.name")
|
sel := htmlDoc.doc.Find("a.name")
|
||||||
assert.Len(t, repos, len(sel.Nodes))
|
assert.Len(t, repos, len(sel.Nodes))
|
||||||
for i := range repos {
|
for i := range repos {
|
||||||
assert.Equal(t, repos[i], strings.TrimSpace(sel.Eq(i).Text()))
|
assert.Equal(t, repos[i], strings.TrimSpace(sel.Eq(i).Text()))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@ -103,7 +103,6 @@ const options: SortableOptions = {
|
|||||||
get() {
|
get() {
|
||||||
return combined.value.map((a) => getId(a)).filter((a, i, arr) => arr.indexOf(a) === i);
|
return combined.value.map((a) => getId(a)).filter((a, i, arr) => arr.indexOf(a) === i);
|
||||||
},
|
},
|
||||||
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
||||||
async set(sortable) {
|
async set(sortable) {
|
||||||
const arr = sortable.toArray();
|
const arr = sortable.toArray();
|
||||||
const groups = Array.from(new Set(arr.filter((a) => a.startsWith('group')).map((a) => parseInt(a.split('-')[1]))));
|
const groups = Array.from(new Set(arr.filter((a) => a.startsWith('group')).map((a) => parseInt(a.split('-')[1]))));
|
||||||
@ -180,7 +179,7 @@ const options: SortableOptions = {
|
|||||||
:class="{ 'expandable-menu': curGroup === 0, 'repo-owner-name-list': curGroup === 0, 'expandable-ul': true }"
|
:class="{ 'expandable-menu': curGroup === 0, 'repo-owner-name-list': curGroup === 0, 'expandable-ul': true }"
|
||||||
v-model:list="combined"
|
v-model:list="combined"
|
||||||
:data-is-group="true"
|
:data-is-group="true"
|
||||||
:item-key="(it) => getId(it)"
|
:item-key="(it: any) => getId(it)"
|
||||||
:key="dynKey"
|
:key="dynKey"
|
||||||
>
|
>
|
||||||
<template #item="{ element, index }">
|
<template #item="{ element, index }">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user