Function doTheRebaseForAmendTests

pkg/integration/tests/commit/shared.go:23–68

(t *TestDriver, keys config.KeybindingConfig)

}

func doTheRebaseForAmendTests(t *TestDriver, keys config.KeybindingConfig) {
	t.Views().Commits().
		Focus().
		Lines(
			Contains("commit three").IsSelected(),
			Contains("file1 changed in branch"),
			Contains("commit two"),
			Contains("base commit"),
		)
	t.Views().Branches().
		Focus().
		NavigateToLine(Contains("master")).
		Press(keys.Branches.RebaseBranch).
		Tap(func() {
			t.ExpectPopup().Menu().
				Title(Equals("Rebase 'branch'")).
				Select(Contains("Simple rebase")).
				Confirm()
			t.Common().AcknowledgeConflicts()
		})

	t.Views().Commits().
		Lines(
			Contains("--- Pending rebase todos ---"),
			Contains("pick").Contains("commit three"),
			Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch"),
			Contains("--- Commits ---"),
			Contains("commit two"),
			Contains("file1 changed in master"),
			Contains("base commit"),
		)

	t.Views().Files().
		Focus().
		PressEnter()

	t.Views().MergeConflicts().
		IsFocused().
		SelectNextItem(). // choose "incoming"
		PressPrimaryAction()

	t.ExpectPopup().Confirmation().
		Title(Equals("Continue")).
		Content(Contains("All merge conflicts resolved. Continue the rebase?")).
		Cancel()
}

func checkCommitContainsChange(t *TestDriver, commitSubject string, change string) {
	t.Views().Commits().