Fix the tests

Signed-off-by: Andrew Thornton <[email protected]>

Author: zeripath

models/repo.go

@@ -499,7 +499,7 @@ func (repo *Repository) DeleteUncyclo() error {
 }
 
 func (repo *Repository) deleteUncyclo(e Engine) error {
-	wikiPaths := []string{repo.UncycloPath(), repo.LocalUncycloPath()}
+	wikiPaths := []string{repo.UncycloPath()}
 	for _, wikiPath := range wikiPaths {
 		removeAllWithNotice(e, "Delete repository wiki", wikiPath)
 	}

models/user.go

@@ -922,17 +922,6 @@ func ChangeUserName(u *User, newUserName string) (err error) {
 		return fmt.Errorf("ChangeUsernameInPullRequests: %v", err)
 	}
 
-	// Delete all local copies of repository wiki that user owns.
-	if err = x.BufferSize(setting.IterateBufferSize).
-		Where("owner_id=?", u.ID).
-		Iterate(new(Repository), func(idx int, bean interface{}) error {
-			repo := bean.(*Repository)
-			RemoveAllWithNotice("Delete repository wiki local copy", repo.LocalUncycloPath())
-			return nil
-		}); err != nil {
-		return fmt.Errorf("Delete repository wiki local copy: %v", err)
-	}
-
 	// Do not fail if directory does not exist
 	if err = os.Rename(UserPath(u.Name), UserPath(newUserName)); err != nil && !os.IsNotExist(err) {
 		return fmt.Errorf("Rename user directory: %v", err)

models/wiki_test.go

@@ -5,13 +5,12 @@
 package models
 
 import (
-	"path"
 	"path/filepath"
 	"testing"
 
+	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/Unknwon/com"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -145,13 +144,6 @@ func TestRepository_InitUncyclo(t *testing.T) {
 	assert.True(t, repo2.HasUncyclo())
 }
 
-func TestRepository_LocalUncycloPath(t *testing.T) {
-	PrepareTestEnv(t)
-	repo := AssertExistsAndLoadBean(t, &Repository{ID: 1}).(*Repository)
-	expected := filepath.Join(setting.AppDataPath, setting.Repository.Local.LocalUncycloPath, "1")
-	assert.Equal(t, expected, repo.LocalUncycloPath())
-}
-
 func TestRepository_AddUncycloPage(t *testing.T) {
 	assert.NoError(t, PrepareTestDatabase())
 	const wikiContent = "This is the wiki content"
@@ -166,8 +158,15 @@ func TestRepository_AddUncycloPage(t *testing.T) {
 		t.Run("test wiki exist: "+wikiName, func(t *testing.T) {
 			t.Parallel()
 			assert.NoError(t, repo.AddUncycloPage(doer, wikiName, wikiContent, commitMsg))
-			expectedPath := path.Join(repo.LocalUncycloPath(), UncycloNameToFilename(wikiName))
-			assert.True(t, com.IsExist(expectedPath))
+			// Now need to show that the page has been added:
+			gitRepo, err := git.OpenRepository(repo.UncycloPath())
+			assert.NoError(t, err)
+			masterTree, err := gitRepo.GetTree("master")
+			assert.NoError(t, err)
+			wikiPath := UncycloNameToFilename(wikiName)
+			entry, err := masterTree.GetTreeEntryByPath(wikiPath)
+			assert.NoError(t, err)
+			assert.Equal(t, wikiPath, entry.Name(), "%s not addded correctly", wikiName)
 		})
 	}
 
@@ -200,11 +199,20 @@ func TestRepository_EditUncycloPage(t *testing.T) {
 	} {
 		PrepareTestEnv(t)
 		assert.NoError(t, repo.EditUncycloPage(doer, "Home", newUncycloName, newUncycloContent, commitMsg))
-		newPath := path.Join(repo.LocalUncycloPath(), UncycloNameToFilename(newUncycloName))
-		assert.True(t, com.IsExist(newPath))
+
+		// Now need to show that the page has been added:
+		gitRepo, err := git.OpenRepository(repo.UncycloPath())
+		assert.NoError(t, err)
+		masterTree, err := gitRepo.GetTree("master")
+		assert.NoError(t, err)
+		wikiPath := UncycloNameToFilename(newUncycloName)
+		entry, err := masterTree.GetTreeEntryByPath(wikiPath)
+		assert.NoError(t, err)
+		assert.Equal(t, wikiPath, entry.Name(), "%s not editted correctly", newUncycloName)
+
 		if newUncycloName != "Home" {
-			oldPath := path.Join(repo.LocalUncycloPath(), "Home.md")
-			assert.False(t, com.IsExist(oldPath))
+			_, err := masterTree.GetTreeEntryByPath("Home.md")
+			assert.Error(t, err)
 		}
 	}
 }
@@ -214,6 +222,13 @@ func TestRepository_DeleteUncycloPage(t *testing.T) {
 	repo := AssertExistsAndLoadBean(t, &Repository{ID: 1}).(*Repository)
 	doer := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User)
 	assert.NoError(t, repo.DeleteUncycloPage(doer, "Home"))
-	wikiPath := path.Join(repo.LocalUncycloPath(), "Home.md")
-	assert.False(t, com.IsExist(wikiPath))
+
+	// Now need to show that the page has been added:
+	gitRepo, err := git.OpenRepository(repo.UncycloPath())
+	assert.NoError(t, err)
+	masterTree, err := gitRepo.GetTree("master")
+	assert.NoError(t, err)
+	wikiPath := UncycloNameToFilename("Home")
+	_, err = masterTree.GetTreeEntryByPath(wikiPath)
+	assert.Error(t, err)
 }

routers/repo/branch.go

@@ -71,12 +71,6 @@ func DeleteBranchPost(ctx *context.Context) {
 		return
 	}
 
-	// Delete branch in local copy if it exists
-	if err := ctx.Repo.Repository.DeleteLocalBranch(branchName); err != nil {
-		ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", branchName))
-		return
-	}
-
 	ctx.Flash.Success(ctx.Tr("repo.branch.deletion_success", branchName))
 }