diff options
| author | Lauris BH <lauris@nix.lv> | 2018-01-05 20:56:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 20:56:50 +0200 |
| commit | 8ac1501ad7f8b350bd9c1bf01b25f994fd3560f9 (patch) | |
| tree | cf9b661996134da3e39aa6ddd2af4e13f7dbf30f /integrations/repo_activity_test.go | |
| parent | a192f3052ed9b59d1404fdcebf2b5c156d6d6969 (diff) | |
| download | gitea-8ac1501ad7f8b350bd9c1bf01b25f994fd3560f9.tar.gz gitea-8ac1501ad7f8b350bd9c1bf01b25f994fd3560f9.zip | |
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)
* Pull request options migration and UI in settings
* Add ignore whitespace functionality
* Fix settings if pull requests are disabled
* Fix migration transaction
* Merge with Rebase functionality
* UI changes and related functionality for pull request merging button
* Implement squash functionality
* Fix rebase merging
* Fix pull request merge tests
* Add squash and rebase tests
* Fix API method to reuse default message functions
* Some refactoring and small fixes
* Remove more hardcoded values from tests
* Remove unneeded check from API method
* Fix variable name and comment typo
* Fix reset commit count after PR merge
Diffstat (limited to 'integrations/repo_activity_test.go')
| -rw-r--r-- | integrations/repo_activity_test.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/integrations/repo_activity_test.go b/integrations/repo_activity_test.go index d3d2de4a2c..40983cbe1a 100644 --- a/integrations/repo_activity_test.go +++ b/integrations/repo_activity_test.go @@ -9,6 +9,7 @@ import ( "strings" "testing" + "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/test" "github.com/stretchr/testify/assert" @@ -24,7 +25,7 @@ func TestRepoActivity(t *testing.T) { resp := testPullCreate(t, session, "user1", "repo1", "master") elem := strings.Split(test.RedirectURL(resp), "/") assert.EqualValues(t, "pulls", elem[3]) - testPullMerge(t, session, elem[1], elem[2], elem[4]) + testPullMerge(t, session, elem[1], elem[2], elem[4], models.MergeStyleMerge) testEditFileToNewBranch(t, session, "user1", "repo1", "master", "feat/better_readme", "README.md", "Hello, World (Edited Again)\n") testPullCreate(t, session, "user1", "repo1", "feat/better_readme") |