Skip to content

Commit

Permalink
Interactive editor tests for commit-msg hook
Browse files Browse the repository at this point in the history 
Supplement the existing tests for the commit-msg hook (which all use
"git commit -m") with tests which use an interactive editor (no -m
switch) to ensure that all code paths get tested.

At the same time the quoting of some of the existing tests is changed
to conform to Junio's recommendations for test style (single quotes
used around the test unless there is a compelling reason not to, and
the opening quote on the same line as the test_expect and the closing
quote in column 1).

Signed-off-by: Wincent Colaiuta <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
@wincent @gitster
wincent authored and gitster committed Dec 10, 2007
1 parent 3d3c4f5 commit 80f8660
Showing 1 changed file with 175 additions and 43 deletions.
218 changes: 175 additions & 43 deletions t/t7504-commit-msg-hook.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,49 @@ test_description='commit-msg hook'

. ./test-lib.sh

test_expect_success "with no hook" \
"echo 'foo' > file &&
git add file &&
git commit -m 'first'"
test_expect_success 'with no hook' '
test_expect_success "--no-verify with no hook" \
"echo 'bar' > file &&
git add file &&
git commit --no-verify -m 'bar'"
echo "foo" > file &&
git add file &&
git commit -m "first"
'

# set up fake editor for interactive editing
cat > fake-editor <<'EOF'
#!/bin/sh
cp FAKE_MSG "$1"
exit 0
EOF
chmod +x fake-editor
FAKE_EDITOR="$(pwd)/fake-editor"
export FAKE_EDITOR

test_expect_success 'with no hook (editor)' '
echo "more foo" >> file &&
git add file &&
echo "more foo" > FAKE_MSG &&
GIT_EDITOR="$FAKE_EDITOR" git commit
'

test_expect_success '--no-verify with no hook' '
echo "bar" > file &&
git add file &&
git commit --no-verify -m "bar"
'

test_expect_success '--no-verify with no hook (editor)' '
echo "more bar" > file &&
git add file &&
echo "more bar" > FAKE_MSG &&
GIT_EDITOR="$FAKE_EDITOR" git commit --no-verify
'

# now install hook that always succeeds
HOOKDIR="$(git rev-parse --git-dir)/hooks"
Expand All @@ -24,42 +58,114 @@ exit 0
EOF
chmod +x "$HOOK"

test_expect_success "with succeeding hook" \
"echo 'more' >> file &&
git add file &&
git commit -m 'more'"
test_expect_success 'with succeeding hook' '
test_expect_success "--no-verify with succeeding hook" \
"echo 'even more' >> file &&
git add file &&
git commit --no-verify -m 'even more'"
echo "more" >> file &&
git add file &&
git commit -m "more"
'

test_expect_success 'with succeeding hook (editor)' '
echo "more more" >> file &&
git add file &&
echo "more more" > FAKE_MSG &&
GIT_EDITOR="$FAKE_EDITOR" git commit
'

test_expect_success '--no-verify with succeeding hook' '
echo "even more" >> file &&
git add file &&
git commit --no-verify -m "even more"
'

test_expect_success '--no-verify with succeeding hook (editor)' '
echo "even more more" >> file &&
git add file &&
echo "even more more" > FAKE_MSG &&
GIT_EDITOR="$FAKE_EDITOR" git commit --no-verify
'

# now a hook that fails
cat > "$HOOK" <<EOF
#!/bin/sh
exit 1
EOF

test_expect_failure "with failing hook" \
"echo 'another' >> file &&
git add file &&
git commit -m 'another'"
test_expect_failure 'with failing hook' '
echo "another" >> file &&
git add file &&
git commit -m "another"
'

test_expect_failure 'with failing hook (editor)' '
echo "more another" >> file &&
git add file &&
echo "more another" > FAKE_MSG &&
GIT_EDITOR="$FAKE_EDITOR" git commit
test_expect_success "--no-verify with failing hook" \
"echo 'stuff' >> file &&
git add file &&
git commit --no-verify -m 'stuff'"
'

test_expect_success '--no-verify with failing hook' '
echo "stuff" >> file &&
git add file &&
git commit --no-verify -m "stuff"
'

test_expect_success '--no-verify with failing hook (editor)' '
echo "more stuff" >> file &&
git add file &&
echo "more stuff" > FAKE_MSG &&
GIT_EDITOR="$FAKE_EDITOR" git commit --no-verify
'

chmod -x "$HOOK"
test_expect_success "with non-executable hook" \
"echo 'content' >> file &&
git add file &&
git commit -m 'content'"
test_expect_success 'with non-executable hook' '
echo "content" >> file &&
git add file &&
git commit -m "content"
'

test_expect_success 'with non-executable hook (editor)' '
echo "content again" >> file &&
git add file &&
echo "content again" > FAKE_MSG &&
GIT_EDITOR="$FAKE_EDITOR" git commit -m "content again"
'

test_expect_success '--no-verify with non-executable hook' '
echo "more content" >> file &&
git add file &&
git commit --no-verify -m "more content"
'

test_expect_success "--no-verify with non-executable hook" \
"echo 'more content' >> file &&
git add file &&
git commit --no-verify -m 'more content'"
test_expect_success '--no-verify with non-executable hook (editor)' '
echo "even more content" >> file &&
git add file &&
echo "even more content" > FAKE_MSG &&
GIT_EDITOR="$FAKE_EDITOR" git commit --no-verify
'

# now a hook that edits the commit message
cat > "$HOOK" <<'EOF'
Expand All @@ -73,16 +179,42 @@ commit_msg_is () {
test "`git log --pretty=format:%s%b -1`" = "$1"
}

test_expect_success "hook edits commit message" \
"echo 'additional' >> file &&
git add file &&
git commit -m 'additional' &&
commit_msg_is 'new message'"

test_expect_success "hook doesn't edit commit message" \
"echo 'plus' >> file &&
git add file &&
git commit --no-verify -m 'plus' &&
commit_msg_is 'plus'"
test_expect_success 'hook edits commit message' '
echo "additional" >> file &&
git add file &&
git commit -m "additional" &&
commit_msg_is "new message"
'

test_expect_success 'hook edits commit message (editor)' '
echo "additional content" >> file &&
git add file &&
echo "additional content" > FAKE_MSG &&
GIT_EDITOR="$FAKE_EDITOR" git commit &&
commit_msg_is "new message"
'

test_expect_success "hook doesn't edit commit message" '
echo "plus" >> file &&
git add file &&
git commit --no-verify -m "plus" &&
commit_msg_is "plus"
'

test_expect_success "hook doesn't edit commit message (editor)" '
echo "more plus" >> file &&
git add file &&
echo "more plus" > FAKE_MSG &&
GIT_EDITOR="$FAKE_EDITOR" git commit --no-verify &&
commit_msg_is "more plus"
'

test_done

0 comments on commit 80f8660

Please sign in to comment.