Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions mob.go
Original file line number Diff line number Diff line change
Expand Up @@ -790,13 +790,13 @@ func next(configuration config.Configuration) {

if isNothingToCommit() {
if currentWipBranch.hasLocalCommits(configuration) {
gitWithoutEmptyStrings("push", gitHooksOption(configuration), configuration.RemoteName, currentWipBranch.Name)
gitWithoutEmptyStrings(append(gitPushArgs(configuration), gitHooksOption(configuration), configuration.RemoteName, currentWipBranch.Name)...)
} else {
say.Info("nothing was done, so nothing to commit")
}
} else {
makeWipCommit(configuration)
gitWithoutEmptyStrings("push", gitHooksOption(configuration), configuration.RemoteName, currentWipBranch.Name)
gitWithoutEmptyStrings(append(gitPushArgs(configuration), gitHooksOption(configuration), configuration.RemoteName, currentWipBranch.Name)...)
}
showNext(configuration)

Expand Down
51 changes: 51 additions & 0 deletions mob_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,58 @@ func TestStartWithOutCISkip(t *testing.T) {
assertMobSessionBranches(t, configuration, "mob-session")
assertCommitLogNotContainsMessage(t, "mob-session", configuration.StartCommitMessage)
assertOutputNotContains(t, output, "--push-option ci.skip")
}

func TestNextWithCISkipLocalCommits(t *testing.T) {
output, configuration := setup(t)
configuration.SkipCiPushOptionEnabled = true
mockExit()

start(configuration)
createFileAndCommitIt(t, "example.txt", "asdf", "asdf")
next(configuration)

assertOutputContains(t, output, "git push --push-option ci.skip")
assertOutputContains(t, output, "Disable the push option ci.skip in your .mob file or set the expected environment variable")
assertOutputContains(t, output, "export MOB_SKIP_CI_PUSH_OPTION_ENABLED=false")
resetExit()
}

func TestNextWithOutCISkipLocalCommits(t *testing.T) {
output, configuration := setup(t)
configuration.SkipCiPushOptionEnabled = false

start(configuration)
createFileAndCommitIt(t, "example.txt", "asdf", "asdf")
next(configuration)

assertOutputNotContains(t, output, "--push-option ci.skip")
}

func TestNextWithCISkipSomethingToCommit(t *testing.T) {
output, configuration := setup(t)
configuration.SkipCiPushOptionEnabled = true
mockExit()

start(configuration)
createFile(t, "example.txt", "contentIrrelevant")
next(configuration)

assertOutputContains(t, output, "git push --push-option ci.skip")
assertOutputContains(t, output, "Disable the push option ci.skip in your .mob file or set the expected environment variable")
assertOutputContains(t, output, "export MOB_SKIP_CI_PUSH_OPTION_ENABLED=false")
resetExit()
}

func TestNextWithOutCISkipSomethingToCommit(t *testing.T) {
output, configuration := setup(t)
configuration.SkipCiPushOptionEnabled = false

start(configuration)
createFile(t, "example.txt", "contentIrrelevant")
next(configuration)

assertOutputNotContains(t, output, "--push-option ci.skip")
}

func TestStartWithMultipleExistingBranches(t *testing.T) {
Expand Down