From 097eb0802a38c370ef7594d7c99aa50148bfefb4 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Mon, 4 Mar 2024 15:32:31 +0500 Subject: [PATCH 1/2] Fix repo unarchivation button --- options/locale/locale_en-US.ini | 4 ++-- templates/repo/settings/options.tmpl | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8216a70cbe..070ab1cc05 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2465,7 +2465,7 @@ settings.matrix.homeserver_url = Homeserver URL settings.matrix.room_id = Room ID settings.matrix.message_type = Message Type settings.archive.button = Archive Repo -settings.archive.header = Archive This Repo +settings.archive.header = Archive this repo settings.archive.text = Archiving the repo will make it entirely read-only. It will be hidden from the dashboard. Nobody (not even you!) will be able to make new commits, or open any issues or pull requests. settings.archive.success = The repo was successfully archived. settings.archive.error = An error occurred while trying to archive the repo. See the log for more details. @@ -2473,7 +2473,7 @@ settings.archive.error_ismirror = You cannot archive a mirrored repo. settings.archive.branchsettings_unavailable = Branch settings are not available if the repo is archived. settings.archive.tagsettings_unavailable = Tag settings are not available if the repo is archived. settings.archive.mirrors_unavailable = Mirrors are not available if the repo is archived. -settings.unarchive.button = Unarchive repo +settings.unarchive.button = Unarchive Repo settings.unarchive.header = Unarchive this repo settings.unarchive.text = Unarchiving the repo will restore its ability to receive commits and pushes, as well as new issues and pull-requests. settings.unarchive.success = The repo was successfully unarchived. diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index fe2764aa83..2c4a924ba7 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -742,7 +742,13 @@
- +
From 8f8b608fd70192a8e33b4632a69af1cdc619e9fd Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sat, 9 Mar 2024 18:28:42 +0500 Subject: [PATCH 2/2] Add test to UI of archive/unarchive related actions --- tests/integration/repo_archive_text_test.go | 76 +++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 tests/integration/repo_archive_text_test.go diff --git a/tests/integration/repo_archive_text_test.go b/tests/integration/repo_archive_text_test.go new file mode 100644 index 0000000000..a14fdbf84f --- /dev/null +++ b/tests/integration/repo_archive_text_test.go @@ -0,0 +1,76 @@ +// Copyright 2024 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package integration + +import ( + "net/http" + "net/url" + "path" + "strings" + "testing" + + "code.gitea.io/gitea/models/unittest" + user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/translation" + "github.com/PuerkitoBio/goquery" + "github.com/stretchr/testify/assert" +) + +func TestArchiveText(t *testing.T) { + onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { + testUser := "user2" + user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: testUser}) + session := loginUser(t, testUser) + testRepoName := "archived_repo" + tr := translation.NewLocale("en-US") + link := path.Join(testUser, testRepoName, "settings") + + // Create test repo + _, _, f := CreateDeclarativeRepo(t, user2, testRepoName, nil, nil, nil) + defer f() + + // Test settings page + req := NewRequest(t, "GET", link) + resp := session.MakeRequest(t, req, http.StatusOK) + archivation := NewHTMLParser(t, resp.Body) + testRepoArchiveElements(t, tr, archivation, "archive") + + // Archive repo + req = NewRequestWithValues(t, "POST", link, map[string]string{ + "action": "archive", + "_csrf": GetCSRF(t, session, link), + }) + _ = session.MakeRequest(t, req, http.StatusSeeOther) + + // Test settings page again + req = NewRequest(t, "GET", link) + resp = session.MakeRequest(t, req, http.StatusOK) + unarchivation := NewHTMLParser(t, resp.Body) + testRepoArchiveElements(t, tr, unarchivation, "unarchive") + }) +} + +func testRepoArchiveElements(t *testing.T, tr translation.Locale, doc *HTMLDoc, opType string) { + t.Helper() + + // Test danger section + section := doc.Find(".danger.segment .flex-list .flex-item:has(.button[data-modal='#archive-repo-modal'])") + testRepoArchiveElement(t, tr, section, ".flex-item-title", opType+".header") + testRepoArchiveElement(t, tr, section, ".flex-item-body", opType+".text") + testRepoArchiveElement(t, tr, section, ".button", opType+".button") + + // Test modal + modal := doc.Find("#archive-repo-modal") + testRepoArchiveElement(t, tr, modal, ".header", opType+".header") + testRepoArchiveElement(t, tr, modal, ".message", opType+".text") + testRepoArchiveElement(t, tr, modal, ".button.red", opType+".button") +} + +func testRepoArchiveElement(t *testing.T, tr translation.Locale, doc *goquery.Selection, selector, op string) { + t.Helper() + + element := doc.Find(selector).Text() + element = strings.TrimSpace(element) + assert.Equal(t, tr.TrString("repo.settings."+op), element) +}