diff options
| author | Lauris BH <lauris@nix.lv> | 2017-10-15 18:06:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-15 18:06:07 +0300 |
| commit | 1ec4dc6c1dec3814d8956bcd1157a51bfe53eb0e (patch) | |
| tree | 742d82bceac48af7f5088be3c70bdb6d000728ea /integrations/pull_merge_test.go | |
| parent | 32ca299650277829b93994eca1508f9d84a5b667 (diff) | |
| download | gitea-1ec4dc6c1dec3814d8956bcd1157a51bfe53eb0e.tar.gz gitea-1ec4dc6c1dec3814d8956bcd1157a51bfe53eb0e.zip | |
Fix so that user can still fork his own repository to owned organizations (#2699)
* Fix so that user can still fork his own repository to his organizations
* Fix to only use owned organizations
* Add integration test for forking own repository to owned organization
Diffstat (limited to 'integrations/pull_merge_test.go')
| -rw-r--r-- | integrations/pull_merge_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go index ddb18f8024..100298b083 100644 --- a/integrations/pull_merge_test.go +++ b/integrations/pull_merge_test.go @@ -48,7 +48,7 @@ func testPullCleanUp(t *testing.T, session *TestSession, user, repo, pullnum str func TestPullMerge(t *testing.T) { prepareTestEnv(t) session := loginUser(t, "user1") - testRepoFork(t, session) + testRepoFork(t, session, "user2", "repo1", "user1", "repo1") testEditFile(t, session, "user1", "repo1", "master", "README.md") resp := testPullCreate(t, session, "user1", "repo1", "master") @@ -61,7 +61,7 @@ func TestPullMerge(t *testing.T) { func TestPullCleanUpAfterMerge(t *testing.T) { prepareTestEnv(t) session := loginUser(t, "user1") - testRepoFork(t, session) + testRepoFork(t, session, "user2", "repo1", "user1", "repo1") testEditFileToNewBranch(t, session, "user1", "repo1", "master", "feature/test", "README.md") resp := testPullCreate(t, session, "user1", "repo1", "feature/test") |