Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for changes in default branch name #691

Merged
merged 1 commit into from
Jul 30, 2022
Merged

Added support for changes in default branch name #691

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions cli-git/src/test/scala/giter8/JGitInteractorTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import java.io.File

import org.apache.commons.io.FileUtils
import org.eclipse.jgit.api.{Git => JGit}
import org.eclipse.jgit.util.SystemReader
import org.eclipse.jgit.lib.ConfigConstants
import org.scalatest.{BeforeAndAfter, TryValues}

import scala.collection.JavaConverters._
Expand All @@ -20,6 +22,13 @@ class JGitInteractorTest extends AnyFlatSpec with Matchers with BeforeAndAfter w
var remoteRepository: File = _
var interactor: JGitInteractor = _

// Since Jgit 5.11, default branch name can be changed by user configuration (e.g. main)
val defaultBranchName = SystemReader.getInstance.getUserConfig.getString(
ConfigConstants.CONFIG_INIT_SECTION,
null,
ConfigConstants.CONFIG_KEY_DEFAULT_BRANCH
)

before {
interactor = new JGitInteractor(None)

Expand All @@ -37,7 +46,7 @@ class JGitInteractorTest extends AnyFlatSpec with Matchers with BeforeAndAfter w
"JGitInteractor" should "clone the remote repository" in tempDirectory { localRepository =>
interactor.cloneRepository(remoteRepository.getAbsolutePath, localRepository) shouldBe Symbol("success")

localRepository.branch shouldBe "master"
localRepository.branch shouldBe defaultBranchName
localRepository.commits should contain theSameElementsAs Seq("Initial commit")
}

Expand All @@ -49,7 +58,7 @@ class JGitInteractorTest extends AnyFlatSpec with Matchers with BeforeAndAfter w
interactor
.getRemoteBranches(remoteRepository.getAbsolutePath)
.success
.value should contain theSameElementsAs branches :+ "master"
.value should contain theSameElementsAs branches :+ defaultBranchName
}

it should "retrieve tag list from remote repository" in {
Expand Down Expand Up @@ -91,12 +100,12 @@ class JGitInteractorTest extends AnyFlatSpec with Matchers with BeforeAndAfter w
}

it should "not fail if checkout existing branch" in tempDirectory { localRepository =>
remoteRepository.checkout("master")
remoteRepository.checkout(defaultBranchName)

interactor.cloneRepository(remoteRepository.getAbsolutePath, localRepository) shouldBe Symbol("success")
interactor.checkoutBranch(localRepository, "master") shouldBe Symbol("success")
interactor.checkoutBranch(localRepository, defaultBranchName) shouldBe Symbol("success")

localRepository.branch shouldBe "master"
localRepository.branch shouldBe defaultBranchName
}

it should "retrieve default branch (where HEAD is pointing)" in tempDirectory { localRepository =>
Expand Down