Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use correct README link to render the README #23152

Merged
merged 9 commits into from
Mar 3, 2023
Merged

Use correct README link to render the README #23152

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ae8a504
add readme file name to treelink
yp05327 Feb 25, 2023
960048f
Merge branch 'main' into fix-wrong-img-link-in-repo-home-page-readme
wolfogre Feb 27, 2023
8f5db22
add test data
yp05327 Mar 2, 2023
32fbf7f
change repo size
yp05327 Mar 2, 2023
477a999
add test func
yp05327 Mar 2, 2023
a7981bf
Merge branch 'main' into fix-wrong-img-link-in-repo-home-page-readme
jolheiser Mar 2, 2023
4a8fb80
Merge test-home-md-img to fix-wrong-img-link-in-repo-home-page-readme
yp05327 Mar 3, 2023
55fed65
Update tests/integration/repo_test.go
yp05327 Mar 3, 2023
f626443
Update tests/integration/repo_test.go
yp05327 Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion models/fixtures/repository.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
fork_id: 0
is_template: false
template_id: 0
size: 6708
size: 7028
is_fsck_enabled: true
close_issues_via_commit_in_any_branch: false

Expand Down
2 changes: 1 addition & 1 deletion routers/web/repo/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
return
}

renderReadmeFile(ctx, readmeFile, treeLink)
renderReadmeFile(ctx, readmeFile, fmt.Sprintf("%s/%s", treeLink, readmeFile.name))
}

// localizedExtensions prepends the provided language code with and without a
Expand Down
Binary file added ...gitea-repositories-meta/user2/repo1.git/objects/40/3d76c604cb569323864e06a07b85d466924802
View file
Open in desktop
Binary file not shown.
Binary file added ...gitea-repositories-meta/user2/repo1.git/objects/78/fb907e3a3309eae4fe8fef030874cebbf1cd5e
View file
Open in desktop
Binary file not shown.
Binary file added ...gitea-repositories-meta/user2/repo1.git/objects/f3/fa0f5cc797fc4c02a1b8bec9de4b2072fcdbdf
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions tests/gitea-repositories-meta/user2/repo1.git/refs/heads/home-md-img-check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
78fb907e3a3309eae4fe8fef030874cebbf1cd5e
20 changes: 20 additions & 0 deletions tests/integration/repo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,3 +256,23 @@ func TestViewRepoDirectory(t *testing.T) {
assert.Zero(t, repoTopics.Length())
assert.Zero(t, repoSummary.Length())
}

func TestMarkDownImage(t *testing.T) {
defer tests.PrepareTestEnv(t)()

session := loginUser(t, "user2")

req := NewRequest(t, "GET", "/user2/repo1/src/branch/home-md-img-check")
resp := session.MakeRequest(t, req, http.StatusOK)

htmlDoc := NewHTMLParser(t, resp.Body)
_, exists := htmlDoc.doc.Find("img[src=\"/user2/repo1/media/branch/home-md-img-check/test-fake-img.jpg\"]").Attr("src")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
_, exists := htmlDoc.doc.Find("img[src=\"/user2/repo1/media/branch/home-md-img-check/test-fake-img.jpg\"]").Attr("src")
_, exists := htmlDoc.doc.Find(`img[src="/user2/repo1/media/branch/home-md-img-check/test-fake-img.jpg"]`).Attr("src")

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In some places, we are using the same format.
Such as:

gitea/tests/integration/repo_generate_test.go

Line 39 in ffce336

link, exists = htmlDoc.doc.Find("form.ui.form[action^=\"/repo/create\"]").Attr("action")

Is it necessary to fix them all in another PR?

assert.True(t, exists, "Repo home page markdown image link check failed")

req = NewRequest(t, "GET", "/user2/repo1/src/branch/home-md-img-check/README.md")
resp = session.MakeRequest(t, req, http.StatusOK)

htmlDoc = NewHTMLParser(t, resp.Body)
_, exists = htmlDoc.doc.Find("img[src=\"/user2/repo1/media/branch/home-md-img-check/test-fake-img.jpg\"]").Attr("src")
yp05327 marked this conversation as resolved.
Show resolved Hide resolved
assert.True(t, exists, "Repo src page markdown image link check failed")
}