Remove the local clones

Makefile

@@ -177,6 +177,11 @@ fmt-check:
 test:
 	GO111MODULE=on $(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' $(PACKAGES)
 
+.PHONY: test\#%
+test\#%:
+	GO111MODULE=on $(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' $(PACKAGES) -run $*
+
+
 .PHONY: coverage
 coverage:
 	@hash gocovmerge > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
@@ -207,6 +212,7 @@ test-sqlite: integrations.sqlite.test
 
 .PHONY: test-sqlite\#%
 test-sqlite\#%: integrations.sqlite.test
+	echo $*
 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.run $*
 
 .PHONY: test-sqlite-migration

contrib/pr/checkout.go

@@ -107,7 +107,6 @@ func runPR() {
 	models.LoadFixtures()
 	os.RemoveAll(setting.RepoRootPath)
 	os.RemoveAll(models.LocalCopyPath())
-	os.RemoveAll(models.LocalWikiPath())
 	com.CopyDir(path.Join(curDir, "integrations/gitea-repositories-meta"), setting.RepoRootPath)
 
 	log.Printf("[PR] Setting up router\n")

integrations/editor_test.go

@@ -7,87 +7,88 @@ package integrations
 import (
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"path"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestCreateFile(t *testing.T) {
-	prepareTestEnv(t)
+	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
+		session := loginUser(t, "user2")
 
-	session := loginUser(t, "user2")
+		// Request editor page
+		req := NewRequest(t, "GET", "/user2/repo1/_new/master/")
+		resp := session.MakeRequest(t, req, http.StatusOK)
 
-	// Request editor page
-	req := NewRequest(t, "GET", "/user2/repo1/_new/master/")
-	resp := session.MakeRequest(t, req, http.StatusOK)
-
-	doc := NewHTMLParser(t, resp.Body)
-	lastCommit := doc.GetInputValueByName("last_commit")
-	assert.NotEmpty(t, lastCommit)
+		doc := NewHTMLParser(t, resp.Body)
+		lastCommit := doc.GetInputValueByName("last_commit")
+		assert.NotEmpty(t, lastCommit)
 
-	// Save new file to master branch
-	req = NewRequestWithValues(t, "POST", "/user2/repo1/_new/master/", map[string]string{
-		"_csrf":         doc.GetCSRF(),
-		"last_commit":   lastCommit,
-		"tree_path":     "test.txt",
-		"content":       "Content",
-		"commit_choice": "direct",
+		// Save new file to master branch
+		req = NewRequestWithValues(t, "POST", "/user2/repo1/_new/master/", map[string]string{
+			"_csrf":         doc.GetCSRF(),
+			"last_commit":   lastCommit,
+			"tree_path":     "test.txt",
+			"content":       "Content",
+			"commit_choice": "direct",
+		})
+		resp = session.MakeRequest(t, req, http.StatusFound)
 	})
-	resp = session.MakeRequest(t, req, http.StatusFound)
 }
 
 func TestCreateFileOnProtectedBranch(t *testing.T) {
-	prepareTestEnv(t)
-
-	session := loginUser(t, "user2")
-
-	csrf := GetCSRF(t, session, "/user2/repo1/settings/branches")
-	// Change master branch to protected
-	req := NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches/master", map[string]string{
-		"_csrf":     csrf,
-		"protected": "on",
-	})
-	resp := session.MakeRequest(t, req, http.StatusFound)
-	// Check if master branch has been locked successfully
-	flashCookie := session.GetCookie("macaron_flash")
-	assert.NotNil(t, flashCookie)
-	assert.EqualValues(t, "success%3DBranch%2Bprotection%2Bfor%2Bbranch%2B%2527master%2527%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
-
-	// Request editor page
-	req = NewRequest(t, "GET", "/user2/repo1/_new/master/")
-	resp = session.MakeRequest(t, req, http.StatusOK)
-
-	doc := NewHTMLParser(t, resp.Body)
-	lastCommit := doc.GetInputValueByName("last_commit")
-	assert.NotEmpty(t, lastCommit)
-
-	// Save new file to master branch
-	req = NewRequestWithValues(t, "POST", "/user2/repo1/_new/master/", map[string]string{
-		"_csrf":         doc.GetCSRF(),
-		"last_commit":   lastCommit,
-		"tree_path":     "test.txt",
-		"content":       "Content",
-		"commit_choice": "direct",
-	})
-
-	resp = session.MakeRequest(t, req, http.StatusOK)
-	// Check body for error message
-	assert.Contains(t, resp.Body.String(), "Cannot commit to protected branch 'master'.")
-
-	// remove the protected branch
-	csrf = GetCSRF(t, session, "/user2/repo1/settings/branches")
-	// Change master branch to protected
-	req = NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches/master", map[string]string{
-		"_csrf":     csrf,
-		"protected": "off",
+	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
+
+		session := loginUser(t, "user2")
+
+		csrf := GetCSRF(t, session, "/user2/repo1/settings/branches")
+		// Change master branch to protected
+		req := NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches/master", map[string]string{
+			"_csrf":     csrf,
+			"protected": "on",
+		})
+		resp := session.MakeRequest(t, req, http.StatusFound)
+		// Check if master branch has been locked successfully
+		flashCookie := session.GetCookie("macaron_flash")
+		assert.NotNil(t, flashCookie)
+		assert.EqualValues(t, "success%3DBranch%2Bprotection%2Bfor%2Bbranch%2B%2527master%2527%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
+
+		// Request editor page
+		req = NewRequest(t, "GET", "/user2/repo1/_new/master/")
+		resp = session.MakeRequest(t, req, http.StatusOK)
+
+		doc := NewHTMLParser(t, resp.Body)
+		lastCommit := doc.GetInputValueByName("last_commit")
+		assert.NotEmpty(t, lastCommit)
+
+		// Save new file to master branch
+		req = NewRequestWithValues(t, "POST", "/user2/repo1/_new/master/", map[string]string{
+			"_csrf":         doc.GetCSRF(),
+			"last_commit":   lastCommit,
+			"tree_path":     "test.txt",
+			"content":       "Content",
+			"commit_choice": "direct",
+		})
+
+		resp = session.MakeRequest(t, req, http.StatusOK)
+		// Check body for error message
+		assert.Contains(t, resp.Body.String(), "Cannot commit to protected branch 'master'.")
+
+		// remove the protected branch
+		csrf = GetCSRF(t, session, "/user2/repo1/settings/branches")
+		// Change master branch to protected
+		req = NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches/master", map[string]string{
+			"_csrf":     csrf,
+			"protected": "off",
+		})
+		resp = session.MakeRequest(t, req, http.StatusFound)
+		// Check if master branch has been locked successfully
+		flashCookie = session.GetCookie("macaron_flash")
+		assert.NotNil(t, flashCookie)
+		assert.EqualValues(t, "success%3DBranch%2Bprotection%2Bfor%2Bbranch%2B%2527master%2527%2Bhas%2Bbeen%2Bdisabled.", flashCookie.Value)
 	})
-	resp = session.MakeRequest(t, req, http.StatusFound)
-	// Check if master branch has been locked successfully
-	flashCookie = session.GetCookie("macaron_flash")
-	assert.NotNil(t, flashCookie)
-	assert.EqualValues(t, "success%3DBranch%2Bprotection%2Bfor%2Bbranch%2B%2527master%2527%2Bhas%2Bbeen%2Bdisabled.", flashCookie.Value)
-
 }
 
 func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePath, newContent string) *httptest.ResponseRecorder {
@@ -151,13 +152,15 @@ func testEditFileToNewBranch(t *testing.T, session *TestSession, user, repo, bra
 }
 
 func TestEditFile(t *testing.T) {
-	prepareTestEnv(t)
-	session := loginUser(t, "user2")
-	testEditFile(t, session, "user2", "repo1", "master", "README.md", "Hello, World (Edited)\n")
+	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
+		session := loginUser(t, "user2")
+		testEditFile(t, session, "user2", "repo1", "master", "README.md", "Hello, World (Edited)\n")
+	})
 }
 
 func TestEditFileToNewBranch(t *testing.T) {
-	prepareTestEnv(t)
-	session := loginUser(t, "user2")
-	testEditFileToNewBranch(t, session, "user2", "repo1", "master", "feature/test", "README.md", "Hello, World (Edited)\n")
+	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
+		session := loginUser(t, "user2")
+		testEditFileToNewBranch(t, session, "user2", "repo1", "master", "feature/test", "README.md", "Hello, World (Edited)\n")
+	})
 }

integrations/integration_test.go

@@ -176,7 +176,6 @@ func prepareTestEnv(t testing.TB, skip ...int) {
 	assert.NoError(t, models.LoadFixtures())
 	assert.NoError(t, os.RemoveAll(setting.RepoRootPath))
 	assert.NoError(t, os.RemoveAll(models.LocalCopyPath()))
-	assert.NoError(t, os.RemoveAll(models.LocalWikiPath()))
 
 	assert.NoError(t, com.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"),
 		setting.RepoRootPath))

integrations/pull_create_test.go

@@ -7,6 +7,7 @@ package integrations
 import (
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"path"
 	"strings"
 	"testing"
@@ -43,63 +44,65 @@ func testPullCreate(t *testing.T, session *TestSession, user, repo, branch, titl
 }
 
 func TestPullCreate(t *testing.T) {
-	prepareTestEnv(t)
-	session := loginUser(t, "user1")
-	testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
-	testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
-	resp := testPullCreate(t, session, "user1", "repo1", "master", "This is a pull title")
-
-	// check the redirected URL
-	url := resp.HeaderMap.Get("Location")
-	assert.Regexp(t, "^/user2/repo1/pulls/[0-9]*$", url)
-
-	// check .diff can be accessed and matches performed change
-	req := NewRequest(t, "GET", url+".diff")
-	resp = session.MakeRequest(t, req, http.StatusOK)
-	assert.Regexp(t, `\+Hello, World \(Edited\)`, resp.Body)
-	assert.Regexp(t, "^diff", resp.Body)
-	assert.NotRegexp(t, "diff.*diff", resp.Body) // not two diffs, just one
-
-	// check .patch can be accessed and matches performed change
-	req = NewRequest(t, "GET", url+".patch")
-	resp = session.MakeRequest(t, req, http.StatusOK)
-	assert.Regexp(t, `\+Hello, World \(Edited\)`, resp.Body)
-	assert.Regexp(t, "diff", resp.Body)
-	assert.Regexp(t, `Subject: \[PATCH\] Update 'README.md'`, resp.Body)
-	assert.NotRegexp(t, "diff.*diff", resp.Body) // not two diffs, just one
+	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
+		session := loginUser(t, "user1")
+		testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
+		testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
+		resp := testPullCreate(t, session, "user1", "repo1", "master", "This is a pull title")
+
+		// check the redirected URL
+		url := resp.HeaderMap.Get("Location")
+		assert.Regexp(t, "^/user2/repo1/pulls/[0-9]*$", url)
+
+		// check .diff can be accessed and matches performed change
+		req := NewRequest(t, "GET", url+".diff")
+		resp = session.MakeRequest(t, req, http.StatusOK)
+		assert.Regexp(t, `\+Hello, World \(Edited\)`, resp.Body)
+		assert.Regexp(t, "^diff", resp.Body)
+		assert.NotRegexp(t, "diff.*diff", resp.Body) // not two diffs, just one
+
+		// check .patch can be accessed and matches performed change
+		req = NewRequest(t, "GET", url+".patch")
+		resp = session.MakeRequest(t, req, http.StatusOK)
+		assert.Regexp(t, `\+Hello, World \(Edited\)`, resp.Body)
+		assert.Regexp(t, "diff", resp.Body)
+		assert.Regexp(t, `Subject: \[PATCH\] Update 'README.md'`, resp.Body)
+		assert.NotRegexp(t, "diff.*diff", resp.Body) // not two diffs, just one
+	})
 }
 
 func TestPullCreate_TitleEscape(t *testing.T) {
-	prepareTestEnv(t)
-	session := loginUser(t, "user1")
-	testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
-	testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
-	resp := testPullCreate(t, session, "user1", "repo1", "master", "<i>XSS PR</i>")
-
-	// check the redirected URL
-	url := resp.HeaderMap.Get("Location")
-	assert.Regexp(t, "^/user2/repo1/pulls/[0-9]*$", url)
-
-	// Edit title
-	req := NewRequest(t, "GET", url)
-	resp = session.MakeRequest(t, req, http.StatusOK)
-	htmlDoc := NewHTMLParser(t, resp.Body)
-	editTestTitleURL, exists := htmlDoc.doc.Find("#save-edit-title").First().Attr("data-update-url")
-	assert.True(t, exists, "The template has changed")
-
-	req = NewRequestWithValues(t, "POST", editTestTitleURL, map[string]string{
-		"_csrf": htmlDoc.GetCSRF(),
-		"title": "<u>XSS PR</u>",
+	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
+		session := loginUser(t, "user1")
+		testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
+		testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
+		resp := testPullCreate(t, session, "user1", "repo1", "master", "<i>XSS PR</i>")
+
+		// check the redirected URL
+		url := resp.HeaderMap.Get("Location")
+		assert.Regexp(t, "^/user2/repo1/pulls/[0-9]*$", url)
+
+		// Edit title
+		req := NewRequest(t, "GET", url)
+		resp = session.MakeRequest(t, req, http.StatusOK)
+		htmlDoc := NewHTMLParser(t, resp.Body)
+		editTestTitleURL, exists := htmlDoc.doc.Find("#save-edit-title").First().Attr("data-update-url")
+		assert.True(t, exists, "The template has changed")
+
+		req = NewRequestWithValues(t, "POST", editTestTitleURL, map[string]string{
+			"_csrf": htmlDoc.GetCSRF(),
+			"title": "<u>XSS PR</u>",
+		})
+		session.MakeRequest(t, req, http.StatusOK)
+
+		req = NewRequest(t, "GET", url)
+		resp = session.MakeRequest(t, req, http.StatusOK)
+		htmlDoc = NewHTMLParser(t, resp.Body)
+		titleHTML, err := htmlDoc.doc.Find(".comments .event .text b").First().Html()
+		assert.NoError(t, err)
+		assert.Equal(t, "&lt;i&gt;XSS PR&lt;/i&gt;", titleHTML)
+		titleHTML, err = htmlDoc.doc.Find(".comments .event .text b").Next().Html()
+		assert.NoError(t, err)
+		assert.Equal(t, "&lt;u&gt;XSS PR&lt;/u&gt;", titleHTML)
 	})
-	session.MakeRequest(t, req, http.StatusOK)
-
-	req = NewRequest(t, "GET", url)
-	resp = session.MakeRequest(t, req, http.StatusOK)
-	htmlDoc = NewHTMLParser(t, resp.Body)
-	titleHTML, err := htmlDoc.doc.Find(".comments .event .text b").First().Html()
-	assert.NoError(t, err)
-	assert.Equal(t, "&lt;i&gt;XSS PR&lt;/i&gt;", titleHTML)
-	titleHTML, err = htmlDoc.doc.Find(".comments .event .text b").Next().Html()
-	assert.NoError(t, err)
-	assert.Equal(t, "&lt;u&gt;XSS PR&lt;/u&gt;", titleHTML)
 }