diff options
| author | Ethan Koenig <ethantkoenig@gmail.com> | 2017-12-15 13:11:02 -0800 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2017-12-15 23:11:02 +0200 |
| commit | befa7445d254cc88662015222c85ccd4c96b9a10 (patch) | |
| tree | d9d7bc81d0eb05c026e8b6688871b38695d5af00 /integrations/pull_merge_test.go | |
| parent | bde0409433531b024e30cf1a4d3e44051631ed85 (diff) | |
| download | gitea-befa7445d254cc88662015222c85ccd4c96b9a10.tar.gz gitea-befa7445d254cc88662015222c85ccd4c96b9a10.zip | |
Unit tests for routers/repo/issue_label (#3198)
Diffstat (limited to 'integrations/pull_merge_test.go')
| -rw-r--r-- | integrations/pull_merge_test.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go index d6413be549..65ccc93f95 100644 --- a/integrations/pull_merge_test.go +++ b/integrations/pull_merge_test.go @@ -11,6 +11,8 @@ import ( "strings" "testing" + "code.gitea.io/gitea/modules/test" + "github.com/stretchr/testify/assert" ) @@ -54,7 +56,7 @@ func TestPullMerge(t *testing.T) { resp := testPullCreate(t, session, "user1", "repo1", "master") - elem := strings.Split(RedirectURL(t, resp), "/") + elem := strings.Split(test.RedirectURL(resp), "/") assert.EqualValues(t, "pulls", elem[3]) testPullMerge(t, session, elem[1], elem[2], elem[4]) } @@ -67,7 +69,7 @@ func TestPullCleanUpAfterMerge(t *testing.T) { resp := testPullCreate(t, session, "user1", "repo1", "feature/test") - elem := strings.Split(RedirectURL(t, resp), "/") + elem := strings.Split(test.RedirectURL(resp), "/") assert.EqualValues(t, "pulls", elem[3]) testPullMerge(t, session, elem[1], elem[2], elem[4]) |