mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	Less verbose integration tests (#2123)
* Helper functions for intergration test boilerplate
This commit is contained in:
		
				
					committed by
					
						
						Kim "BKC" Carlbäcker
					
				
			
			
				
	
			
			
			
						parent
						
							5651cc7413
						
					
				
				
					commit
					f1adaef458
				
			@@ -18,27 +18,19 @@ func TestViewUser(t *testing.T) {
 | 
			
		||||
	prepareTestEnv(t)
 | 
			
		||||
 | 
			
		||||
	req := NewRequest(t, "GET", "/user2")
 | 
			
		||||
	resp := MakeRequest(req)
 | 
			
		||||
	assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 | 
			
		||||
	MakeRequest(t, req, http.StatusOK)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestRenameUsername(t *testing.T) {
 | 
			
		||||
	prepareTestEnv(t)
 | 
			
		||||
 | 
			
		||||
	session := loginUser(t, "user2")
 | 
			
		||||
 | 
			
		||||
	req := NewRequest(t, "GET", "/user/settings")
 | 
			
		||||
	resp := session.MakeRequest(t, req)
 | 
			
		||||
	assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 | 
			
		||||
 | 
			
		||||
	htmlDoc := NewHTMLParser(t, resp.Body)
 | 
			
		||||
	req = NewRequestWithValues(t, "POST", "/user/settings", map[string]string{
 | 
			
		||||
		"_csrf": htmlDoc.GetCSRF(),
 | 
			
		||||
	req := NewRequestWithValues(t, "POST", "/user/settings", map[string]string{
 | 
			
		||||
		"_csrf": GetCSRF(t, session, "/user/settings"),
 | 
			
		||||
		"name":  "newUsername",
 | 
			
		||||
		"email": "user2@example.com",
 | 
			
		||||
	})
 | 
			
		||||
	resp = session.MakeRequest(t, req)
 | 
			
		||||
	assert.EqualValues(t, http.StatusFound, resp.HeaderCode)
 | 
			
		||||
	session.MakeRequest(t, req, http.StatusFound)
 | 
			
		||||
 | 
			
		||||
	models.AssertExistsAndLoadBean(t, &models.User{Name: "newUsername"})
 | 
			
		||||
	models.AssertNotExistsBean(t, &models.User{Name: "user2"})
 | 
			
		||||
@@ -58,19 +50,14 @@ func TestRenameInvalidUsername(t *testing.T) {
 | 
			
		||||
	session := loginUser(t, "user2")
 | 
			
		||||
	for _, invalidUsername := range invalidUsernames {
 | 
			
		||||
		t.Logf("Testing username %s", invalidUsername)
 | 
			
		||||
		req := NewRequest(t, "GET", "/user/settings")
 | 
			
		||||
		resp := session.MakeRequest(t, req)
 | 
			
		||||
		assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 | 
			
		||||
 | 
			
		||||
		htmlDoc := NewHTMLParser(t, resp.Body)
 | 
			
		||||
		req = NewRequestWithValues(t, "POST", "/user/settings", map[string]string{
 | 
			
		||||
			"_csrf": htmlDoc.GetCSRF(),
 | 
			
		||||
		req := NewRequestWithValues(t, "POST", "/user/settings", map[string]string{
 | 
			
		||||
			"_csrf": GetCSRF(t, session, "/user/settings"),
 | 
			
		||||
			"name":  invalidUsername,
 | 
			
		||||
			"email": "user2@example.com",
 | 
			
		||||
		})
 | 
			
		||||
		resp = session.MakeRequest(t, req)
 | 
			
		||||
		assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 | 
			
		||||
		htmlDoc = NewHTMLParser(t, resp.Body)
 | 
			
		||||
		resp := session.MakeRequest(t, req, http.StatusOK)
 | 
			
		||||
		htmlDoc := NewHTMLParser(t, resp.Body)
 | 
			
		||||
		assert.Contains(t,
 | 
			
		||||
			htmlDoc.doc.Find(".ui.negative.message").Text(),
 | 
			
		||||
			i18n.Tr("en", "form.alpha_dash_dot_error"),
 | 
			
		||||
@@ -92,23 +79,16 @@ func TestRenameReservedUsername(t *testing.T) {
 | 
			
		||||
	session := loginUser(t, "user2")
 | 
			
		||||
	for _, reservedUsername := range reservedUsernames {
 | 
			
		||||
		t.Logf("Testing username %s", reservedUsername)
 | 
			
		||||
		req := NewRequest(t, "GET", "/user/settings")
 | 
			
		||||
		resp := session.MakeRequest(t, req)
 | 
			
		||||
		assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 | 
			
		||||
 | 
			
		||||
		htmlDoc := NewHTMLParser(t, resp.Body)
 | 
			
		||||
		req = NewRequestWithValues(t, "POST", "/user/settings", map[string]string{
 | 
			
		||||
			"_csrf": htmlDoc.GetCSRF(),
 | 
			
		||||
		req := NewRequestWithValues(t, "POST", "/user/settings", map[string]string{
 | 
			
		||||
			"_csrf": GetCSRF(t, session, "/user/settings"),
 | 
			
		||||
			"name":  reservedUsername,
 | 
			
		||||
			"email": "user2@example.com",
 | 
			
		||||
		})
 | 
			
		||||
		resp = session.MakeRequest(t, req)
 | 
			
		||||
		assert.EqualValues(t, http.StatusFound, resp.HeaderCode)
 | 
			
		||||
		resp := session.MakeRequest(t, req, http.StatusFound)
 | 
			
		||||
 | 
			
		||||
		req = NewRequest(t, "GET", "/user/settings")
 | 
			
		||||
		resp = session.MakeRequest(t, req)
 | 
			
		||||
		assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
 | 
			
		||||
		htmlDoc = NewHTMLParser(t, resp.Body)
 | 
			
		||||
		req = NewRequest(t, "GET", RedirectURL(t, resp))
 | 
			
		||||
		resp = session.MakeRequest(t, req, http.StatusOK)
 | 
			
		||||
		htmlDoc := NewHTMLParser(t, resp.Body)
 | 
			
		||||
		assert.Contains(t,
 | 
			
		||||
			htmlDoc.doc.Find(".ui.negative.message").Text(),
 | 
			
		||||
			i18n.Tr("en", "user.newName_reserved"),
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user