mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-05 17:59:51 +00:00
c35531dd11
# Summary The repo information such as description, stats and topics are getting displayed in the top-bar when viewing a file. This has been fixed to display the repo information only while navigating the repo and not while viewing or blaming a file from the repo ## Before fix Screenshot from the issue ![image](https://user-images.githubusercontent.com/47709856/195278543-9afbb735-7bd3-4f42-b3ba-da514c6989d2.png) ## After the fix - **Repo homepage** The repo description, topics and summary will be displayed ![image](https://user-images.githubusercontent.com/47709856/195443913-2ca967cd-6694-4a97-98d0-4d0750692b5d.png) - **When opening a file** The repo description, topic and summary has been conditionally hidden from the view <img width="1311" alt="image" src="https://user-images.githubusercontent.com/47709856/195278964-9479231c-62ad-4c0e-b438-2018f22289db.png"> - **When running blame on a file** > This was originally not part of the issue #21406. However the fix seems relevant for the blame view as well. <img width="1312" alt="image" src="https://user-images.githubusercontent.com/47709856/195279619-02010775-aec3-4c8d-a184-d2d838c797e8.png"> - **From within a directory** The repo description, topics and summary will not be displayed ![image](https://user-images.githubusercontent.com/47709856/195444080-ff5b2def-7e0f-47d7-b54a-7e9df5f9edd8.png) Supporting integration tests have also been added.
260 lines
7.9 KiB
Go
260 lines
7.9 KiB
Go
// Copyright 2017 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package integration
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"path"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
|
"code.gitea.io/gitea/tests"
|
|
|
|
"github.com/PuerkitoBio/goquery"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestViewRepo(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
session := loginUser(t, "user2")
|
|
|
|
req := NewRequest(t, "GET", "/user2/repo1")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
noDescription := htmlDoc.doc.Find("#repo-desc").Children()
|
|
repoTopics := htmlDoc.doc.Find("#repo-topics").Children()
|
|
repoSummary := htmlDoc.doc.Find(".repository-summary").Children()
|
|
|
|
assert.True(t, noDescription.HasClass("no-description"))
|
|
assert.True(t, repoTopics.HasClass("repo-topic"))
|
|
assert.True(t, repoSummary.HasClass("repository-menu"))
|
|
|
|
req = NewRequest(t, "GET", "/user3/repo3")
|
|
MakeRequest(t, req, http.StatusNotFound)
|
|
|
|
session = loginUser(t, "user1")
|
|
session.MakeRequest(t, req, http.StatusNotFound)
|
|
}
|
|
|
|
func testViewRepo(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
req := NewRequest(t, "GET", "/user3/repo3")
|
|
session := loginUser(t, "user2")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
files := htmlDoc.doc.Find("#repo-files-table > TBODY > TR")
|
|
|
|
type file struct {
|
|
fileName string
|
|
commitID string
|
|
commitMsg string
|
|
commitTime string
|
|
}
|
|
|
|
var items []file
|
|
|
|
files.Each(func(i int, s *goquery.Selection) {
|
|
tds := s.Find("td")
|
|
var f file
|
|
tds.Each(func(i int, s *goquery.Selection) {
|
|
if i == 0 {
|
|
f.fileName = strings.TrimSpace(s.Text())
|
|
} else if i == 1 {
|
|
a := s.Find("a")
|
|
f.commitMsg = strings.TrimSpace(a.Text())
|
|
l, _ := a.Attr("href")
|
|
f.commitID = path.Base(l)
|
|
}
|
|
})
|
|
|
|
f.commitTime, _ = s.Find("span.time-since").Attr("data-content")
|
|
items = append(items, f)
|
|
})
|
|
|
|
commitT := time.Date(2017, time.June, 14, 13, 54, 21, 0, time.UTC).In(time.Local).Format(time.RFC1123)
|
|
assert.EqualValues(t, []file{
|
|
{
|
|
fileName: "doc",
|
|
commitID: "2a47ca4b614a9f5a43abbd5ad851a54a616ffee6",
|
|
commitMsg: "init project",
|
|
commitTime: commitT,
|
|
},
|
|
{
|
|
fileName: "README.md",
|
|
commitID: "2a47ca4b614a9f5a43abbd5ad851a54a616ffee6",
|
|
commitMsg: "init project",
|
|
commitTime: commitT,
|
|
},
|
|
}, items)
|
|
}
|
|
|
|
func TestViewRepo2(t *testing.T) {
|
|
// no last commit cache
|
|
testViewRepo(t)
|
|
|
|
// enable last commit cache for all repositories
|
|
oldCommitsCount := setting.CacheService.LastCommit.CommitsCount
|
|
setting.CacheService.LastCommit.CommitsCount = 0
|
|
// first view will not hit the cache
|
|
testViewRepo(t)
|
|
// second view will hit the cache
|
|
testViewRepo(t)
|
|
setting.CacheService.LastCommit.CommitsCount = oldCommitsCount
|
|
}
|
|
|
|
func TestViewRepo3(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
req := NewRequest(t, "GET", "/user3/repo3")
|
|
session := loginUser(t, "user4")
|
|
session.MakeRequest(t, req, http.StatusOK)
|
|
}
|
|
|
|
func TestViewRepo1CloneLinkAnonymous(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
req := NewRequest(t, "GET", "/user2/repo1")
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
link, exists := htmlDoc.doc.Find("#repo-clone-https").Attr("data-link")
|
|
assert.True(t, exists, "The template has changed")
|
|
assert.Equal(t, setting.AppURL+"user2/repo1.git", link)
|
|
_, exists = htmlDoc.doc.Find("#repo-clone-ssh").Attr("data-link")
|
|
assert.False(t, exists)
|
|
}
|
|
|
|
func TestViewRepo1CloneLinkAuthorized(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
session := loginUser(t, "user2")
|
|
|
|
req := NewRequest(t, "GET", "/user2/repo1")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
link, exists := htmlDoc.doc.Find("#repo-clone-https").Attr("data-link")
|
|
assert.True(t, exists, "The template has changed")
|
|
assert.Equal(t, setting.AppURL+"user2/repo1.git", link)
|
|
link, exists = htmlDoc.doc.Find("#repo-clone-ssh").Attr("data-link")
|
|
assert.True(t, exists, "The template has changed")
|
|
sshURL := fmt.Sprintf("ssh://%s@%s:%d/user2/repo1.git", setting.SSH.User, setting.SSH.Domain, setting.SSH.Port)
|
|
assert.Equal(t, sshURL, link)
|
|
}
|
|
|
|
func TestViewRepoWithSymlinks(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
session := loginUser(t, "user2")
|
|
|
|
req := NewRequest(t, "GET", "/user2/repo20.git")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
files := htmlDoc.doc.Find("#repo-files-table > TBODY > TR > TD.name > SPAN.truncate")
|
|
items := files.Map(func(i int, s *goquery.Selection) string {
|
|
cls, _ := s.Find("SVG").Attr("class")
|
|
file := strings.Trim(s.Find("A").Text(), " \t\n")
|
|
return fmt.Sprintf("%s: %s", file, cls)
|
|
})
|
|
assert.Len(t, items, 5)
|
|
assert.Equal(t, "a: svg octicon-file-directory-fill", items[0])
|
|
assert.Equal(t, "link_b: svg octicon-file-submodule", items[1])
|
|
assert.Equal(t, "link_d: svg octicon-file-symlink-file", items[2])
|
|
assert.Equal(t, "link_hi: svg octicon-file-symlink-file", items[3])
|
|
assert.Equal(t, "link_link: svg octicon-file-symlink-file", items[4])
|
|
}
|
|
|
|
// TestViewAsRepoAdmin tests PR #2167
|
|
func TestViewAsRepoAdmin(t *testing.T) {
|
|
for user, expectedNoDescription := range map[string]bool{
|
|
"user2": true,
|
|
"user4": false,
|
|
} {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
session := loginUser(t, user)
|
|
|
|
req := NewRequest(t, "GET", "/user2/repo1.git")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
noDescription := htmlDoc.doc.Find("#repo-desc").Children()
|
|
repoTopics := htmlDoc.doc.Find("#repo-topics").Children()
|
|
repoSummary := htmlDoc.doc.Find(".repository-summary").Children()
|
|
|
|
assert.Equal(t, expectedNoDescription, noDescription.HasClass("no-description"))
|
|
assert.True(t, repoTopics.HasClass("repo-topic"))
|
|
assert.True(t, repoSummary.HasClass("repository-menu"))
|
|
}
|
|
}
|
|
|
|
// TestViewFileInRepo repo description, topics and summary should not be displayed when viewing a file
|
|
func TestViewFileInRepo(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
session := loginUser(t, "user2")
|
|
|
|
req := NewRequest(t, "GET", "/user2/repo1/src/branch/master/README.md")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
description := htmlDoc.doc.Find("#repo-desc")
|
|
repoTopics := htmlDoc.doc.Find("#repo-topics")
|
|
repoSummary := htmlDoc.doc.Find(".repository-summary")
|
|
|
|
assert.EqualValues(t, 0, description.Length())
|
|
assert.EqualValues(t, 0, repoTopics.Length())
|
|
assert.EqualValues(t, 0, repoSummary.Length())
|
|
}
|
|
|
|
// TestBlameFileInRepo repo description, topics and summary should not be displayed when running blame on a file
|
|
func TestBlameFileInRepo(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
session := loginUser(t, "user2")
|
|
|
|
req := NewRequest(t, "GET", "/user2/repo1/blame/branch/master/README.md")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
description := htmlDoc.doc.Find("#repo-desc")
|
|
repoTopics := htmlDoc.doc.Find("#repo-topics")
|
|
repoSummary := htmlDoc.doc.Find(".repository-summary")
|
|
|
|
assert.EqualValues(t, 0, description.Length())
|
|
assert.EqualValues(t, 0, repoTopics.Length())
|
|
assert.EqualValues(t, 0, repoSummary.Length())
|
|
}
|
|
|
|
// TestViewRepoDirectory repo description, topics and summary should not be displayed when within a directory
|
|
func TestViewRepoDirectory(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
|
|
session := loginUser(t, "user2")
|
|
|
|
req := NewRequest(t, "GET", "/user2/repo20/src/branch/master/a")
|
|
resp := session.MakeRequest(t, req, http.StatusOK)
|
|
|
|
htmlDoc := NewHTMLParser(t, resp.Body)
|
|
description := htmlDoc.doc.Find("#repo-desc")
|
|
repoTopics := htmlDoc.doc.Find("#repo-topics")
|
|
repoSummary := htmlDoc.doc.Find(".repository-summary")
|
|
|
|
repoFilesTable := htmlDoc.doc.Find("#repo-files-table")
|
|
assert.NotZero(t, len(repoFilesTable.Nodes))
|
|
|
|
assert.Zero(t, description.Length())
|
|
assert.Zero(t, repoTopics.Length())
|
|
assert.Zero(t, repoSummary.Length())
|
|
}
|