mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	Integration test for activity page (#2704)
* Integration test for activity page * Small code refactoring for acitvity page * Move activity stats calculation logic to model
This commit is contained in:
		@@ -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")
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user