fine tune tests

Author: wxiaoguang

tests/integration/download_test.go

@@ -14,84 +14,60 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestDownloadByID(t *testing.T) {
+func TestDownloadRepoContent(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 
 	session := loginUser(t, "user2")
 
-	// Request raw blob
-	req := NewRequest(t, "GET", "/user2/repo1/raw/blob/4b4851ad51df6a7d9f25c979345979eaeb5b349f")
-	resp := session.MakeRequest(t, req, http.StatusOK)
-
-	assert.Equal(t, "# repo1\n\nDescription for repo1", resp.Body.String())
-}
-
-func TestDownloadByIDForSVGUsesSecureHeaders(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
-
-	session := loginUser(t, "user2")
-
-	// Request raw blob
-	req := NewRequest(t, "GET", "/user2/repo2/raw/blob/6395b68e1feebb1e4c657b4f9f6ba2676a283c0b")
-	resp := session.MakeRequest(t, req, http.StatusOK)
-
-	assert.Equal(t, "default-src 'none'; style-src 'unsafe-inline'; sandbox", resp.Header().Get("Content-Security-Policy"))
-	assert.Equal(t, "image/svg+xml", resp.Header().Get("Content-Type"))
-	assert.Equal(t, "nosniff", resp.Header().Get("X-Content-Type-Options"))
-}
-
-func TestDownloadByIDMedia(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
-
-	session := loginUser(t, "user2")
-
-	// Request raw blob
-	req := NewRequest(t, "GET", "/user2/repo1/media/blob/4b4851ad51df6a7d9f25c979345979eaeb5b349f")
-	resp := session.MakeRequest(t, req, http.StatusOK)
-
-	assert.Equal(t, "# repo1\n\nDescription for repo1", resp.Body.String())
-}
-
-func TestDownloadByIDMediaForSVGUsesSecureHeaders(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
-
-	session := loginUser(t, "user2")
-
-	// Request raw blob
-	req := NewRequest(t, "GET", "/user2/repo2/media/blob/6395b68e1feebb1e4c657b4f9f6ba2676a283c0b")
-	resp := session.MakeRequest(t, req, http.StatusOK)
-
-	assert.Equal(t, "default-src 'none'; style-src 'unsafe-inline'; sandbox", resp.Header().Get("Content-Security-Policy"))
-	assert.Equal(t, "image/svg+xml", resp.Header().Get("Content-Type"))
-	assert.Equal(t, "nosniff", resp.Header().Get("X-Content-Type-Options"))
-}
-
-func TestDownloadRawTextFileWithoutMimeTypeMapping(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
-
-	session := loginUser(t, "user2")
-
-	req := NewRequest(t, "GET", "/user2/repo2/raw/branch/master/test.xml")
-	resp := session.MakeRequest(t, req, http.StatusOK)
-
-	assert.Equal(t, "text/plain; charset=utf-8", resp.Header().Get("Content-Type"))
-}
-
-func TestDownloadRawTextFileWithMimeTypeMapping(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
-	defer test.MockVariableValue(&setting.MimeTypeMap)()
-
-	setting.MimeTypeMap.Enabled = true
-	session := loginUser(t, "user2")
-
-	setting.MimeTypeMap.Map[".xml"] = "text/xml"
-	req := NewRequest(t, "GET", "/user2/repo2/raw/branch/master/test.xml")
-	resp := session.MakeRequest(t, req, http.StatusOK)
-	assert.Equal(t, "inline; filename=test.xml", resp.Header().Get("Content-Disposition"))
-	assert.Equal(t, "text/xml; charset=utf-8", resp.Header().Get("Content-Type"))
-
-	setting.MimeTypeMap.Map[".xml"] = "application/xml"
-	req = NewRequest(t, "GET", "/user2/repo2/raw/branch/master/test.xml")
-	resp = session.MakeRequest(t, req, http.StatusOK)
-	assert.Equal(t, "application/xml", resp.Header().Get("Content-Type"))
+	t.Run("RawBlob", func(t *testing.T) {
+		req := NewRequest(t, "GET", "/user2/repo1/raw/blob/4b4851ad51df6a7d9f25c979345979eaeb5b349f")
+		resp := session.MakeRequest(t, req, http.StatusOK)
+		assert.Equal(t, "# repo1\n\nDescription for repo1", resp.Body.String())
+	})
+
+	t.Run("SVGUsesSecureHeaders", func(t *testing.T) {
+		req := NewRequest(t, "GET", "/user2/repo2/raw/blob/6395b68e1feebb1e4c657b4f9f6ba2676a283c0b")
+		resp := session.MakeRequest(t, req, http.StatusOK)
+		assert.Equal(t, "default-src 'none'; style-src 'unsafe-inline'; sandbox", resp.Header().Get("Content-Security-Policy"))
+		assert.Equal(t, "image/svg+xml", resp.Header().Get("Content-Type"))
+		assert.Equal(t, "nosniff", resp.Header().Get("X-Content-Type-Options"))
+	})
+
+	t.Run("MediaBlob", func(t *testing.T) {
+		req := NewRequest(t, "GET", "/user2/repo1/media/blob/4b4851ad51df6a7d9f25c979345979eaeb5b349f")
+		resp := session.MakeRequest(t, req, http.StatusOK)
+		assert.Equal(t, "# repo1\n\nDescription for repo1", resp.Body.String())
+	})
+
+	t.Run("MediaSVGUsesSecureHeaders", func(t *testing.T) {
+		req := NewRequest(t, "GET", "/user2/repo2/media/blob/6395b68e1feebb1e4c657b4f9f6ba2676a283c0b")
+		resp := session.MakeRequest(t, req, http.StatusOK)
+		assert.Equal(t, "default-src 'none'; style-src 'unsafe-inline'; sandbox", resp.Header().Get("Content-Security-Policy"))
+		assert.Equal(t, "image/svg+xml", resp.Header().Get("Content-Type"))
+		assert.Equal(t, "nosniff", resp.Header().Get("X-Content-Type-Options"))
+	})
+
+	t.Run("MimeTypeMap", func(t *testing.T) {
+		req := NewRequest(t, "GET", "/user2/repo2/raw/branch/master/test.xml")
+		resp := session.MakeRequest(t, req, http.StatusOK)
+		// although the file is a valid XML file, it is served as "text/plain" to avoid site content spamming (the same to "text/html" files)
+		assert.Equal(t, "text/plain; charset=utf-8", resp.Header().Get("Content-Type"))
+
+		defer tests.PrepareTestEnv(t)()
+		defer test.MockVariableValue(&setting.MimeTypeMap)()
+		setting.MimeTypeMap.Enabled = true
+
+		setting.MimeTypeMap.Map[".xml"] = "text/xml"
+		req = NewRequest(t, "GET", "/user2/repo2/raw/branch/master/test.xml")
+		resp = session.MakeRequest(t, req, http.StatusOK)
+		// respect the mime mapping, and "text/plain" protection isn't used anymore
+		assert.Equal(t, "text/xml; charset=utf-8", resp.Header().Get("Content-Type"))
+		assert.Equal(t, "inline; filename=test.xml", resp.Header().Get("Content-Disposition"))
+
+		setting.MimeTypeMap.Map[".xml"] = "application/xml"
+		req = NewRequest(t, "GET", "/user2/repo2/raw/branch/master/test.xml")
+		resp = session.MakeRequest(t, req, http.StatusOK)
+		// non-text file don't have "charset"
+		assert.Equal(t, "application/xml", resp.Header().Get("Content-Type"))
+	})
 }