mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	Feature: Timetracking (#2211)
* Added comment's hashtag to url for mail notifications. * Added explanation to return statement + documentation. * Replacing in-line link generation with HTMLURL. (+gofmt) * Replaced action-based model with nil-based model. (+gofmt) * Replaced mailIssueActionToParticipants with mailIssueCommentToParticipants. * Updating comment for mailIssueCommentToParticipants * Added link to comment in "Dashboard" * Deleting feed entry if a comment is going to be deleted * Added migration * Added improved migration to add a CommentID column to action. * Added improved links to comments in feed entries. * Fixes #1956 by filtering for deleted comments that are referenced in actions. * Introducing "IsDeleted" column to action. * Adding design draft (not functional) * Adding database models for stopwatches and trackedtimes * See go-gitea/gitea#967 * Adding design draft (not functional) * Adding translations and improving design * Implementing stopwatch (for timetracking) * Make UI functional * Add hints in timeline for time tracking events * Implementing timetracking feature * Adding "Add time manual" option * Improved stopwatch * Created report of total spent time by user * Only showing total time spent if theire is something to show. * Adding license headers. * Improved error handling for "Add Time Manual" * Adding @sapks 's changes, refactoring * Adding API for feature tracking * Adding unit test * Adding DISABLE/ENABLE option to Repository settings page * Improving translations * Applying @sapk 's changes * Removing repo_unit and using IssuesSetting for disabling/enabling timetracker * Adding DEFAULT_ENABLE_TIMETRACKER to config, installation and admin menu * Improving documentation * Fixing vendor/ folder * Changing timtracking routes by adding subgroups /times and /times/stopwatch (Proposed by @lafriks ) * Restricting write access to timetracking based on the repo settings (Proposed by @lafriks ) * Fixed minor permissions bug. * Adding CanUseTimetracker and IsTimetrackerEnabled in ctx.Repo * Allow assignees and authors to track there time too. * Fixed some build-time-errors + logical errors. * Removing unused Get...ByID functions * Moving IsTimetrackerEnabled from context.Repository to models.Repository * Adding a seperate file for issue related repo functions * Adding license headers * Fixed GetUserByParams return 404 * Moving /users/:username/times to /repos/:username/:reponame/times/:username for security reasons * Adding /repos/:username/times to get all tracked times of the repo * Updating sdk-dependency * Updating swagger.v1.json * Adding warning if user has already a running stopwatch (auto-timetracker) * Replacing GetTrackedTimesBy... with GetTrackedTimes(options FindTrackedTimesOptions) * Changing code.gitea.io/sdk back to code.gitea.io/sdk * Correcting spelling mistake * Updating vendor.json * Changing GET stopwatch/toggle to POST stopwatch/toggle * Changing GET stopwatch/cancel to POST stopwatch/cancel * Added migration for stopwatches/timetracking * Fixed some access bugs for read-only users * Added default allow only contributors to track time value to config * Fixed migration by chaging x.Iterate to x.Find * Resorted imports * Moved Add Time Manually form to repo_form.go * Removed "Seconds" field from Add Time Manually * Resorted imports * Improved permission checking * Fixed some bugs * Added integration test * gofmt * Adding integration test by @lafriks * Added created_unix to comment fixtures * Using last event instead of a fixed event * Adding another integration test by @lafriks * Fixing bug Timetracker enabled causing error 500 at sidebar.tpl * Fixed a refactoring bug that resulted in hiding "HasUserStopwatch" warning. * Returning TrackedTime instead of AddTimeOption at AddTime. * Updating SDK from go-gitea/go-sdk#69 * Resetting Go-SDK back to default repository * Fixing test-vendor by changing ini back to original repository * Adding "tags" to swagger spec * govendor sync * Removed duplicate * Formatting templates * Adding IsTimetrackingEnabled checks to API * Improving translations / english texts * Improving documentation * Updating swagger spec * Fixing integration test caused be translation-changes * Removed encoding issues in local_en-US.ini. * "Added" copyright line * Moved unit.IssuesConfig().EnableTimetracker into a != nil check * Removed some other encoding issues in local_en-US.ini * Improved javascript by checking if data-context exists * Replaced manual comment creation with CreateComment * Removed unnecessary code * Improved error checking * Small cosmetic changes * Replaced int>string>duration parsing with int>duration parsing * Fixed encoding issues * Removed unused imports Signed-off-by: Jonas Franz <info@jonasfranz.software>
This commit is contained in:
		@@ -40,3 +40,13 @@ func (doc *HTMLDoc) GetInputValueByName(name string) string {
 | 
			
		||||
func (doc *HTMLDoc) GetCSRF() string {
 | 
			
		||||
	return doc.GetInputValueByName("_csrf")
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// AssertElement check if element by selector exists or does not exist depending on checkExists
 | 
			
		||||
func (doc *HTMLDoc) AssertElement(t testing.TB, selector string, checkExists bool) {
 | 
			
		||||
	sel := doc.doc.Find(selector)
 | 
			
		||||
	if checkExists {
 | 
			
		||||
		assert.Equal(t, 1, sel.Length())
 | 
			
		||||
	} else {
 | 
			
		||||
		assert.Equal(t, 0, sel.Length())
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										74
									
								
								integrations/timetracking_test.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										74
									
								
								integrations/timetracking_test.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,74 @@
 | 
			
		||||
// 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 integrations
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"net/http"
 | 
			
		||||
	"path"
 | 
			
		||||
	"testing"
 | 
			
		||||
 | 
			
		||||
	"github.com/stretchr/testify/assert"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
func TestViewTimetrackingControls(t *testing.T) {
 | 
			
		||||
	prepareTestEnv(t)
 | 
			
		||||
	session := loginUser(t, "user2")
 | 
			
		||||
	testViewTimetrackingControls(t, session, "user2", "repo1", "1", true)
 | 
			
		||||
	//user2/repo1
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestNotViewTimetrackingControls(t *testing.T) {
 | 
			
		||||
	prepareTestEnv(t)
 | 
			
		||||
	session := loginUser(t, "user5")
 | 
			
		||||
	testViewTimetrackingControls(t, session, "user2", "repo1", "1", false)
 | 
			
		||||
	//user2/repo1
 | 
			
		||||
}
 | 
			
		||||
func TestViewTimetrackingControlsDisabled(t *testing.T) {
 | 
			
		||||
	prepareTestEnv(t)
 | 
			
		||||
	session := loginUser(t, "user2")
 | 
			
		||||
	testViewTimetrackingControls(t, session, "user3", "repo3", "1", false)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func testViewTimetrackingControls(t *testing.T, session *TestSession, user, repo, issue string, canTrackTime bool) {
 | 
			
		||||
	req := NewRequest(t, "GET", path.Join(user, repo, "issues", issue))
 | 
			
		||||
	resp := session.MakeRequest(t, req, http.StatusOK)
 | 
			
		||||
 | 
			
		||||
	htmlDoc := NewHTMLParser(t, resp.Body)
 | 
			
		||||
 | 
			
		||||
	htmlDoc.AssertElement(t, ".timetrack .start-add .start", canTrackTime)
 | 
			
		||||
	htmlDoc.AssertElement(t, ".timetrack .start-add .add-time", canTrackTime)
 | 
			
		||||
 | 
			
		||||
	req = NewRequestWithValues(t, "POST", path.Join(user, repo, "issues", issue, "times", "stopwatch", "toggle"), map[string]string{
 | 
			
		||||
		"_csrf": htmlDoc.GetCSRF(),
 | 
			
		||||
	})
 | 
			
		||||
	if canTrackTime {
 | 
			
		||||
		resp = session.MakeRequest(t, req, http.StatusSeeOther)
 | 
			
		||||
 | 
			
		||||
		req = NewRequest(t, "GET", RedirectURL(t, resp))
 | 
			
		||||
		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 .stop-cancel .stop", true)
 | 
			
		||||
		htmlDoc.AssertElement(t, ".timetrack .stop-cancel .cancel", true)
 | 
			
		||||
 | 
			
		||||
		req = NewRequestWithValues(t, "POST", path.Join(user, repo, "issues", issue, "times", "stopwatch", "toggle"), map[string]string{
 | 
			
		||||
			"_csrf": htmlDoc.GetCSRF(),
 | 
			
		||||
		})
 | 
			
		||||
		resp = session.MakeRequest(t, req, http.StatusSeeOther)
 | 
			
		||||
 | 
			
		||||
		req = NewRequest(t, "GET", RedirectURL(t, resp))
 | 
			
		||||
		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(), "stopped working")
 | 
			
		||||
		htmlDoc.AssertElement(t, ".event .detail .octicon-clock", true)
 | 
			
		||||
	} else {
 | 
			
		||||
		session.MakeRequest(t, req, http.StatusNotFound)
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user