package git_commands import ( "regexp" "strconv" "testing" "github.com/go-errors/errors" "github.com/jesseduffield/lazygit/pkg/app/daemon" "github.com/jesseduffield/lazygit/pkg/commands/git_config" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/samber/lo" "github.com/stretchr/testify/assert" ) func TestRebaseRebaseBranch(t *testing.T) { type scenario struct { testName string arg string runner *oscommands.FakeCmdObjRunner test func(error) } scenarios := []scenario{ { testName: "successful rebase", arg: "master", runner: oscommands.NewFakeRunner(t). Expect(`git rebase --interactive --autostash --keep-empty --empty=keep --no-autosquash master`, "", nil), test: func(err error) { assert.NoError(t, err) }, }, { testName: "unsuccessful rebase", arg: "master", runner: oscommands.NewFakeRunner(t). Expect(`git rebase --interactive --autostash --keep-empty --empty=keep --no-autosquash master`, "", errors.New("error")), test: func(err error) { assert.Error(t, err) }, }, } for _, s := range scenarios { s := s t.Run(s.testName, func(t *testing.T) { instance := buildRebaseCommands(commonDeps{runner: s.runner}) s.test(instance.RebaseBranch(s.arg)) }) } } // TestRebaseSkipEditorCommand confirms that SkipEditorCommand injects // environment variables that suppress an interactive editor func TestRebaseSkipEditorCommand(t *testing.T) { commandStr := "git blah" runner := oscommands.NewFakeRunner(t).ExpectFunc(func(cmdObj oscommands.ICmdObj) (string, error) { assert.Equal(t, commandStr, cmdObj.ToString()) envVars := cmdObj.GetEnvVars() for _, regexStr := range []string{ `^VISUAL=.*$`, `^EDITOR=.*$`, `^GIT_EDITOR=.*$`, `^GIT_SEQUENCE_EDITOR=.*$`, "^" + daemon.DaemonKindEnvKey + "=" + strconv.Itoa(int(daemon.DaemonKindExitImmediately)) + "$", } { regexStr := regexStr foundMatch := lo.ContainsBy(envVars, func(envVar string) bool { return regexp.MustCompile(regexStr).MatchString(envVar) }) if !foundMatch { t.Errorf("expected environment variable %s to be set", regexStr) } } return "", nil }) instance := buildRebaseCommands(commonDeps{runner: runner}) err := instance.runSkipEditorCommand(instance.cmd.New(commandStr)) assert.NoError(t, err) runner.CheckForMissingCalls() } func TestRebaseDiscardOldFileChanges(t *testing.T) { type scenario struct { testName string gitConfigMockResponses map[string]string commits []*models.Commit commitIndex int fileName string runner *oscommands.FakeCmdObjRunner test func(error) } scenarios := []scenario{ { testName: "returns error when index outside of range of commits", gitConfigMockResponses: nil, commits: []*models.Commit{}, commitIndex: 0, fileName: "test999.txt", runner: oscommands.NewFakeRunner(t), test: func(err error) { assert.Error(t, err) }, }, { testName: "returns error when using gpg", gitConfigMockResponses: map[string]string{"commit.gpgsign": "true"}, commits: []*models.Commit{{Name: "commit", Sha: "123456"}}, commitIndex: 0, fileName: "test999.txt", runner: oscommands.NewFakeRunner(t), test: func(err error) { assert.Error(t, err) }, }, { testName: "checks out file if it already existed", gitConfigMockResponses: nil, commits: []*models.Commit{ {Name: "commit", Sha: "123456"}, {Name: "commit2", Sha: "abcdef"}, }, commitIndex: 0, fileName: "test999.txt", runner: oscommands.NewFakeRunner(t). Expect(`git rebase --interactive --autostash --keep-empty --empty=keep --no-autosquash abcdef`, "", nil). Expect(`git cat-file -e HEAD^:"test999.txt"`, "", nil). Expect(`git checkout HEAD^ -- "test999.txt"`, "", nil). Expect(`git commit --amend --no-edit --allow-empty`, "", nil). Expect(`git rebase --continue`, "", nil), test: func(err error) { assert.NoError(t, err) }, }, // test for when the file was created within the commit requires a refactor to support proper mocks // currently we'd need to mock out the os.Remove function and that's gonna introduce tech debt } for _, s := range scenarios { s := s t.Run(s.testName, func(t *testing.T) { instance := buildRebaseCommands(commonDeps{ runner: s.runner, gitConfig: git_config.NewFakeGitConfig(s.gitConfigMockResponses), }) s.test(instance.DiscardOldFileChanges(s.commits, s.commitIndex, s.fileName)) s.runner.CheckForMissingCalls() }) } }