fix tests

go-gitea · Dec 4, 2024 · 00ca5e3 · 00ca5e3
1 parent 2e8ec9d
commit 00ca5e3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 26 deletions.
diff --git a/templates/repo/issue/sidebar/stopwatch_timetracker.tmpl b/templates/repo/issue/sidebar/stopwatch_timetracker.tmpl
@@ -8,7 +8,7 @@
 					{{if $.IsStopwatchRunning}}{{svg "octicon-stopwatch"}}{{end}}
 				</a>
 				<div class="menu">
-					<a class="item issue-stop-time show-modal" data-modal="#issue-time-set-estimate-modal">
+					<a class="item issue-set-time-estimate show-modal" data-modal="#issue-time-set-estimate-modal">
 						{{svg "octicon-pencil"}} {{ctx.Locale.Tr "repo.issues.time_estimate_set"}}
 					</a>
 					<div class="divider"></div>

diff --git a/tests/integration/timetracking_test.go b/tests/integration/timetracking_test.go
@@ -9,30 +9,31 @@ import (
 	"testing"
 	"time"
 
-	"code.gitea.io/gitea/modules/test"
 	"code.gitea.io/gitea/tests"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestViewTimetrackingControls(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
-	session := loginUser(t, "user2")
-	testViewTimetrackingControls(t, session, "user2", "repo1", "1", true)
-	// user2/repo1
-}
 
-func TestNotViewTimetrackingControls(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
-	session := loginUser(t, "user5")
-	testViewTimetrackingControls(t, session, "user2", "repo1", "1", false)
-	// user2/repo1
-}
+	t.Run("Exist", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		session := loginUser(t, "user2")
+		testViewTimetrackingControls(t, session, "user2", "repo1", "1", true)
+	})
 
-func TestViewTimetrackingControlsDisabled(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
-	session := loginUser(t, "user2")
-	testViewTimetrackingControls(t, session, "org3", "repo3", "1", false)
+	t.Run("Non-exist", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		session := loginUser(t, "user5")
+		testViewTimetrackingControls(t, session, "user2", "repo1", "1", false)
+	})
+
+	t.Run("Disabled", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		session := loginUser(t, "user2")
+		testViewTimetrackingControls(t, session, "org3", "repo3", "1", false)
+	})
 }
 
 func testViewTimetrackingControls(t *testing.T, session *TestSession, user, repo, issue string, canTrackTime bool) {
@@ -41,34 +42,35 @@ func testViewTimetrackingControls(t *testing.T, session *TestSession, user, repo
 
 	htmlDoc := NewHTMLParser(t, resp.Body)
 
-	htmlDoc.AssertElement(t, ".timetrack .issue-start-time", canTrackTime)
-	htmlDoc.AssertElement(t, ".timetrack .issue-add-time", canTrackTime)
+	htmlDoc.AssertElement(t, ".issue-start-time", canTrackTime)
+	htmlDoc.AssertElement(t, ".issue-add-time", canTrackTime)
 
-	req = NewRequestWithValues(t, "POST", path.Join(user, repo, "issues", issue, "times", "stopwatch", "toggle"), map[string]string{
+	issueLink := path.Join(user, repo, "issues", issue)
+	req = NewRequestWithValues(t, "POST", path.Join(issueLink, "times", "stopwatch", "toggle"), map[string]string{
 		"_csrf": htmlDoc.GetCSRF(),
 	})
 	if canTrackTime {
-		resp = session.MakeRequest(t, req, http.StatusSeeOther)
+		resp = session.MakeRequest(t, req, http.StatusOK)
 
-		req = NewRequest(t, "GET", test.RedirectURL(resp))
+		req = NewRequest(t, "GET", issueLink)
 		resp = session.MakeRequest(t, req, http.StatusOK)
 		htmlDoc = NewHTMLParser(t, resp.Body)
 
 		events := htmlDoc.doc.Find(".event > span.text")
 		assert.Contains(t, events.Last().Text(), "started working")
 
-		htmlDoc.AssertElement(t, ".timetrack .issue-stop-time", true)
-		htmlDoc.AssertElement(t, ".timetrack .issue-cancel-time", true)
+		htmlDoc.AssertElement(t, ".issue-stop-time", true)
+		htmlDoc.AssertElement(t, ".issue-cancel-time", true)
 
 		// Sleep for 1 second to not get wrong order for stopping timer
 		time.Sleep(time.Second)
 
-		req = NewRequestWithValues(t, "POST", path.Join(user, repo, "issues", issue, "times", "stopwatch", "toggle"), map[string]string{
+		req = NewRequestWithValues(t, "POST", path.Join(issueLink, "times", "stopwatch", "toggle"), map[string]string{
 			"_csrf": htmlDoc.GetCSRF(),
 		})
-		resp = session.MakeRequest(t, req, http.StatusSeeOther)
+		resp = session.MakeRequest(t, req, http.StatusOK)
 
-		req = NewRequest(t, "GET", test.RedirectURL(resp))
+		req = NewRequest(t, "GET", issueLink)
 		resp = session.MakeRequest(t, req, http.StatusOK)
 		htmlDoc = NewHTMLParser(t, resp.Body)