diff options
| author | 6543 <6543@obermui.de> | 2020-01-17 07:03:40 +0100 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2020-01-17 08:03:40 +0200 |
| commit | 36943e56d66a2d711a6b0c27219ce91a3ddc020a (patch) | |
| tree | 6e1c57454beeaa9d64470c82db1140a5f540ad65 /models/issue_test.go | |
| parent | 9f40bb020eaea153eca77d3071a4f2cc8bcd2a8e (diff) | |
| download | gitea-36943e56d66a2d711a6b0c27219ce91a3ddc020a.tar.gz gitea-36943e56d66a2d711a6b0c27219ce91a3ddc020a.zip | |
Add "Update Branch" button to Pull Requests (#9784)
* add Divergence
* add Update Button
* first working version
* re-use code
* split raw merge commands and db-change functions (notify, cache, ...)
* use rawMerge (remove redundant code)
* own function to get Diverging of PRs
* use FlashError
* correct Error Msg
* hook is triggerd ... so remove comment
* add "branch2" to "user2/repo1" because it unit-test "TestPullView_ReviewerMissed" use it but dont exist jet :/
* move GetPerm to IsUserAllowedToUpdate
* add Flash Success MSG
* imprufe code
- remove useless js chage
* fix-lint
* TEST: add PullRequest ID:5
Repo: user2/repo1
Base: branch1
Head: pr-to-update
* correct comments
* make PR5 outdated
* fix Tests
* WIP: add pull update test
* update revs
* update locales
* working TEST
* update UI
* misspell
* change style
* add 1s delay so rev exist
* move row up (before merge row)
* fix lint nit
* UI remove divider
* Update style
* nits
* do it right
* introduce IsSameRepo
* remove useless check
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'models/issue_test.go')
| -rw-r--r-- | models/issue_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/models/issue_test.go b/models/issue_test.go index ec4867d075..d65345a508 100644 --- a/models/issue_test.go +++ b/models/issue_test.go @@ -276,8 +276,8 @@ func TestIssue_SearchIssueIDsByKeyword(t *testing.T) { total, ids, err = SearchIssueIDsByKeyword("for", []int64{1}, 10, 0) assert.NoError(t, err) - assert.EqualValues(t, 4, total) - assert.EqualValues(t, []int64{1, 2, 3, 5}, ids) + assert.EqualValues(t, 5, total) + assert.EqualValues(t, []int64{1, 2, 3, 5, 11}, ids) // issue1's comment id 2 total, ids, err = SearchIssueIDsByKeyword("good", []int64{1}, 10, 0) @@ -305,8 +305,8 @@ func testInsertIssue(t *testing.T, title, content string) { assert.True(t, has) assert.EqualValues(t, issue.Title, newIssue.Title) assert.EqualValues(t, issue.Content, newIssue.Content) - // there are 4 issues and max index is 4 on repository 1, so this one should 5 - assert.EqualValues(t, 5, newIssue.Index) + // there are 5 issues and max index is 5 on repository 1, so this one should 6 + assert.EqualValues(t, 6, newIssue.Index) _, err = x.ID(issue.ID).Delete(new(Issue)) assert.NoError(t, err) |