mirror of
https://github.com/go-gitea/gitea
synced 2024-12-17 09:34:06 +01:00
5ccecb44ad
* 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>
103 lines
2.8 KiB
Go
103 lines
2.8 KiB
Go
package models
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestAddTime(t *testing.T) {
|
|
assert.NoError(t, PrepareTestDatabase())
|
|
|
|
user3, err := GetUserByID(3)
|
|
assert.NoError(t, err)
|
|
|
|
issue1, err := GetIssueByID(1)
|
|
assert.NoError(t, err)
|
|
|
|
//3661 = 1h 1min 1s
|
|
trackedTime, err := AddTime(user3, issue1, 3661)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, int64(3), trackedTime.UserID)
|
|
assert.Equal(t, int64(1), trackedTime.IssueID)
|
|
assert.Equal(t, int64(3661), trackedTime.Time)
|
|
|
|
tt := AssertExistsAndLoadBean(t, &TrackedTime{UserID: 3, IssueID: 1}).(*TrackedTime)
|
|
assert.Equal(t, tt.Time, int64(3661))
|
|
|
|
comment := AssertExistsAndLoadBean(t, &Comment{Type: CommentTypeAddTimeManual, PosterID: 3, IssueID: 1}).(*Comment)
|
|
assert.Equal(t, comment.Content, "1h 1min 1s")
|
|
}
|
|
|
|
func TestGetTrackedTimes(t *testing.T) {
|
|
assert.NoError(t, PrepareTestDatabase())
|
|
|
|
// by Issue
|
|
times, err := GetTrackedTimes(FindTrackedTimesOptions{IssueID: 1})
|
|
assert.NoError(t, err)
|
|
assert.Len(t, times, 1)
|
|
assert.Equal(t, times[0].Time, int64(400))
|
|
|
|
times, err = GetTrackedTimes(FindTrackedTimesOptions{IssueID: -1})
|
|
assert.NoError(t, err)
|
|
assert.Len(t, times, 0)
|
|
|
|
// by User
|
|
times, err = GetTrackedTimes(FindTrackedTimesOptions{UserID: 1})
|
|
assert.NoError(t, err)
|
|
assert.Len(t, times, 1)
|
|
assert.Equal(t, times[0].Time, int64(400))
|
|
|
|
times, err = GetTrackedTimes(FindTrackedTimesOptions{UserID: 3})
|
|
assert.NoError(t, err)
|
|
assert.Len(t, times, 0)
|
|
|
|
// by Repo
|
|
times, err = GetTrackedTimes(FindTrackedTimesOptions{RepositoryID: 2})
|
|
assert.NoError(t, err)
|
|
assert.Len(t, times, 1)
|
|
assert.Equal(t, times[0].Time, int64(1))
|
|
issue, err := GetIssueByID(times[0].IssueID)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, issue.RepoID, int64(2))
|
|
|
|
times, err = GetTrackedTimes(FindTrackedTimesOptions{RepositoryID: 1})
|
|
assert.NoError(t, err)
|
|
assert.Len(t, times, 4)
|
|
|
|
times, err = GetTrackedTimes(FindTrackedTimesOptions{RepositoryID: 10})
|
|
assert.NoError(t, err)
|
|
assert.Len(t, times, 0)
|
|
}
|
|
|
|
func TestTotalTimes(t *testing.T) {
|
|
assert.NoError(t, PrepareTestDatabase())
|
|
|
|
total, err := TotalTimes(FindTrackedTimesOptions{IssueID: 1})
|
|
assert.NoError(t, err)
|
|
assert.Len(t, total, 1)
|
|
for user, time := range total {
|
|
assert.Equal(t, int64(1), user.ID)
|
|
assert.Equal(t, "6min 40s", time)
|
|
}
|
|
|
|
total, err = TotalTimes(FindTrackedTimesOptions{IssueID: 2})
|
|
assert.NoError(t, err)
|
|
assert.Len(t, total, 1)
|
|
for user, time := range total {
|
|
assert.Equal(t, int64(2), user.ID)
|
|
assert.Equal(t, "1h 1min 2s", time)
|
|
}
|
|
|
|
total, err = TotalTimes(FindTrackedTimesOptions{IssueID: 5})
|
|
assert.NoError(t, err)
|
|
assert.Len(t, total, 1)
|
|
for user, time := range total {
|
|
assert.Equal(t, int64(2), user.ID)
|
|
assert.Equal(t, "1s", time)
|
|
}
|
|
|
|
total, err = TotalTimes(FindTrackedTimesOptions{IssueID: 4})
|
|
assert.NoError(t, err)
|
|
assert.Len(t, total, 0)
|
|
}
|