-
-
Notifications
You must be signed in to change notification settings - Fork 237
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #120 from stefanzweifel/revert-115-feature/checkou…
…t-options Revert "Feature: Checkout Options"
- Loading branch information
Showing
5 changed files
with
2 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,7 +32,6 @@ setup() { | |
export INPUT_COMMIT_AUTHOR="Test Suite <[email protected]>" | ||
export INPUT_TAGGING_MESSAGE="" | ||
export INPUT_PUSH_OPTIONS="" | ||
export INPUT_CHECKOUT_OPTIONS="" | ||
export INPUT_SKIP_DIRTY_CHECK=false | ||
|
||
skipIfNot "$BATS_TEST_DESCRIPTION" | ||
|
@@ -309,39 +308,6 @@ main() { | |
|
||
} | ||
|
||
@test "git-checkout-options-are-applied" { | ||
|
||
INPUT_CHECKOUT_OPTIONS="-b --progress" | ||
|
||
touch "${test_repository}"/new-file-{1,2,3}.txt | ||
|
||
shellmock_expect git --type partial --output " M new-file-1.txt M new-file-2.txt M new-file-3.txt" --match "status" | ||
shellmock_expect git --type exact --match "fetch" | ||
shellmock_expect git --type exact --match "checkout -b --progress master --" | ||
shellmock_expect git --type partial --match "add ." | ||
shellmock_expect git --type partial --match '-c' | ||
shellmock_expect git --type partial --match 'push --set-upstream origin' | ||
|
||
run main | ||
|
||
echo "$output" | ||
|
||
# Success Exit Code | ||
[ "$status" = 0 ] | ||
|
||
[ "${lines[10]}" = "::debug::Push commit to remote branch master" ] | ||
|
||
|
||
shellmock_verify | ||
[ "${capture[0]}" = "git-stub status -s -- ." ] | ||
[ "${capture[1]}" = "git-stub fetch" ] | ||
[ "${capture[2]}" = "git-stub checkout -b --progress master --" ] | ||
[ "${capture[3]}" = "git-stub add ." ] | ||
[ "${capture[4]}" = "git-stub -c user.name=Test Suite -c [email protected] commit -m Commit Message --author=Test Suite <[email protected]>" ] | ||
[ "${capture[5]}" = "git-stub push --set-upstream origin HEAD:master --tags" ] | ||
|
||
} | ||
|
||
@test "can-checkout-different-branch" { | ||
|
||
INPUT_BRANCH="foo" | ||
|