diff options
author | Lauris BH <lauris@nix.lv> | 2017-09-12 13:54:45 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-12 13:54:45 +0300 |
commit | 8c3a2e817be8a365abf167893e1d73ae79382cb6 (patch) | |
tree | 9a173372ff2b8448057bbd642ea545ad07050ed1 | |
parent | 9bdbfbf6f3289f4df0df5aae9998a08483f22218 (diff) | |
download | gitea-8c3a2e817be8a365abf167893e1d73ae79382cb6.tar.gz gitea-8c3a2e817be8a365abf167893e1d73ae79382cb6.zip |
Add missing fixture to clean gpg_key table (#2494)
* Add missing fixture to clean gpg_key table
* Fix possible too fast request execution in timetracker start/stop test
-rw-r--r-- | integrations/timetracking_test.go | 4 | ||||
-rw-r--r-- | models/fixtures/gpg_key.yml | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/integrations/timetracking_test.go b/integrations/timetracking_test.go index e92cb95a89..534bb4d613 100644 --- a/integrations/timetracking_test.go +++ b/integrations/timetracking_test.go @@ -8,6 +8,7 @@ import ( "net/http" "path" "testing" + "time" "github.com/stretchr/testify/assert" ) @@ -56,6 +57,9 @@ func testViewTimetrackingControls(t *testing.T, session *TestSession, user, repo htmlDoc.AssertElement(t, ".timetrack .stop-cancel .stop", true) htmlDoc.AssertElement(t, ".timetrack .stop-cancel .cancel", 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{ "_csrf": htmlDoc.GetCSRF(), }) diff --git a/models/fixtures/gpg_key.yml b/models/fixtures/gpg_key.yml new file mode 100644 index 0000000000..ca780a73aa --- /dev/null +++ b/models/fixtures/gpg_key.yml @@ -0,0 +1 @@ +[] # empty |