diff options
| author | Lauris BH <lauris@nix.lv> | 2017-10-16 00:54:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-16 00:54:53 +0300 |
| commit | c7f4f07765a96ac4b66f40167ed4207aa4e34dad (patch) | |
| tree | e476f019eb40cd61de15398ef3c928606b5dda5d /integrations/pull_merge_test.go | |
| parent | f3833b7ce4dc78095194808c6e07d8ae133e7ab5 (diff) | |
| download | gitea-c7f4f07765a96ac4b66f40167ed4207aa4e34dad.tar.gz gitea-c7f4f07765a96ac4b66f40167ed4207aa4e34dad.zip | |
Integration test for activity page (#2704)
* Integration test for activity page
* Small code refactoring for acitvity page
* Move activity stats calculation logic to model
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 100298b083..f3be6f2885 100644 --- a/integrations/pull_merge_test.go +++ b/integrations/pull_merge_test.go @@ -49,7 +49,7 @@ func TestPullMerge(t *testing.T) { prepareTestEnv(t) session := loginUser(t, "user1") testRepoFork(t, session, "user2", "repo1", "user1", "repo1") - testEditFile(t, session, "user1", "repo1", "master", "README.md") + testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n") resp := testPullCreate(t, session, "user1", "repo1", "master") @@ -62,7 +62,7 @@ func TestPullCleanUpAfterMerge(t *testing.T) { prepareTestEnv(t) session := loginUser(t, "user1") testRepoFork(t, session, "user2", "repo1", "user1", "repo1") - testEditFileToNewBranch(t, session, "user1", "repo1", "master", "feature/test", "README.md") + testEditFileToNewBranch(t, session, "user1", "repo1", "master", "feature/test", "README.md", "Hello, World (Edited)\n") resp := testPullCreate(t, session, "user1", "repo1", "feature/test") |