mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-03-19 21:28:28 +02:00
8c716184c1
We need to fetch our list of tests both outside of our test binary and within. We need to get the list from within so that we can run the code that drives the test and runs assertions. To get the list of tests we need to know where the root of the lazygit repo is, given that the tests live in files under that root. So far, we've used this GetLazyRootDirectory() function for that, but it assumes that we're not in a test directory (it just looks for the first .git dir it can find). Because we didn't want to properly fix this before, we've been setting the working directory of the test command to the lazygit root, and using the --path CLI arg to override it when the test itself ran. This was a terrible hack. Now, we're passing the lazygit root directory as an env var to the integration test, so that we can set the working directory to the actual path of the test repo; removing the need to use the --path arg.
105 lines
2.9 KiB
Go
105 lines
2.9 KiB
Go
package worktree
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var BareRepo = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Open lazygit in the worktree of a bare repo and do a rebase/bisect",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
// we're going to have a directory structure like this:
|
|
// project
|
|
// - .bare
|
|
// - repo (a worktree)
|
|
// - worktree2 (another worktree)
|
|
//
|
|
// The first repo is called 'repo' because that's the
|
|
// directory that all lazygit tests start in
|
|
|
|
shell.NewBranch("mybranch")
|
|
shell.CreateFileAndAdd("blah", "blah")
|
|
shell.Commit("initial commit")
|
|
shell.EmptyCommit("commit two")
|
|
shell.EmptyCommit("commit three")
|
|
|
|
shell.RunCommand([]string{"git", "clone", "--bare", ".", "../.bare"})
|
|
|
|
shell.DeleteFile(".git")
|
|
|
|
shell.Chdir("..")
|
|
|
|
// This is the dir we were just in (and the dir that lazygit starts in when the test runs)
|
|
// We're going to replace it with a worktree
|
|
shell.DeleteFile("repo")
|
|
|
|
shell.RunCommand([]string{"git", "--git-dir", ".bare", "worktree", "add", "-b", "repo", "repo", "mybranch"})
|
|
shell.RunCommand([]string{"git", "--git-dir", ".bare", "worktree", "add", "-b", "worktree2", "worktree2", "mybranch"})
|
|
|
|
shell.Chdir("repo")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Branches().
|
|
Lines(
|
|
Contains("repo"),
|
|
Contains("mybranch"),
|
|
Contains("worktree2 (worktree)"),
|
|
)
|
|
|
|
// test that a rebase works fine
|
|
// (rebase uses the git dir of the worktree so we're confirming that it points
|
|
// to the right git dir)
|
|
t.Views().Commits().
|
|
Focus().
|
|
Lines(
|
|
Contains("commit three").IsSelected(),
|
|
Contains("commit two"),
|
|
Contains("initial commit"),
|
|
).
|
|
Press(keys.Commits.MoveDownCommit).
|
|
Lines(
|
|
Contains("commit two"),
|
|
Contains("commit three").IsSelected(),
|
|
Contains("initial commit"),
|
|
).
|
|
// test that bisect works fine (same logic as above)
|
|
NavigateToLine(Contains("commit two")).
|
|
Press(keys.Commits.ViewBisectOptions).
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().
|
|
Title(Equals("Bisect")).
|
|
Select(MatchesRegexp(`Mark .* as bad`)).
|
|
Confirm()
|
|
|
|
t.Views().Information().Content(Contains("Bisecting"))
|
|
}).
|
|
NavigateToLine(Contains("initial commit")).
|
|
Press(keys.Commits.ViewBisectOptions).
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().
|
|
Title(Equals("Bisect")).
|
|
Select(MatchesRegexp(`Mark .* as good`)).
|
|
Confirm()
|
|
|
|
t.Views().Information().Content(Contains("Bisecting"))
|
|
})
|
|
|
|
// switch to other worktree
|
|
t.Views().Worktrees().
|
|
Focus().
|
|
Lines(
|
|
Contains("repo").IsSelected(),
|
|
Contains("worktree2"),
|
|
).
|
|
NavigateToLine(Contains("worktree2")).
|
|
Press(keys.Universal.Select).
|
|
Lines(
|
|
Contains("worktree2").IsSelected(),
|
|
Contains("repo"),
|
|
)
|
|
},
|
|
})
|