Merge pull request #12 from nnutter/delete

increased test coverage and quality

Author: nnutter

.travis.yml

@@ -1,6 +1,7 @@
+language: perl
 before_install:
     - git clone https://github.com/sstephenson/bats.git
 install:
     - sudo bats/install.sh /usr/local
 script:
-    - t/git-bd.bats
+    - prove -v t/*.bats

t/README.md

@@ -0,0 +1,32 @@
+Running tests requires the [Bash Automated Testing System][1] which can be
+easily installed from source and from Homebrew.
+
+Once [BATS][1] is installed you can execute the test files directly, for example,
+
+```
+$ t/create.bats
+ ✓ create succeeds without start point
+ ✓ create succeeds with start point
+ ✓ create fails when start point doesn't exist
+
+3 tests, 0 failures
+```
+
+Since [BATS][1] can produce TAP output you can use it with `prove`, for example,
+
+```
+$ prove -j 4 --exec bats t/*.bats
+t/branch_exists.bats ..... ok
+t/bd_registered.bats ..... ok
+t/create.bats ............ ok
+t/bd_exists.bats ......... ok
+t/setup.bats ............. ok
+t/rename.bats ............ ok
+t/work_tree_exists.bats .. ok
+t/delete.bats ............ ok
+All tests successful.
+Files=8, Tests=29,  7 wallclock secs ( 0.05 usr  0.02 sys +  8.44 cusr  8.53 csys = 17.04 CPU)
+Result: PASS
+```
+
+[1]: https://github.com/sstephenson/bats

t/bd_exists.bats

@@ -0,0 +1,38 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+function setup {
+    init_repo
+}
+
+function teardown {
+    tempdir_cleanup
+}
+
+@test "bd_exists does find known bd" {
+    git bd some_bd
+    bd_exists some_bd
+}
+
+@test "bd_exists does not find unknown bd" {
+    ! bd_exists some_bd
+}
+
+@test "bd_exists fails if branch is deleted" {
+    git bd some_bd
+    git branch -d some_bd
+    ! bd_exists some_bd
+}
+
+@test "bd_exists fails if work_tree is deleted" {
+    git bd some_bd
+    rm -rf "${TEMPDIR}/some_bd"
+    ! bd_exists some_bd
+}
+
+@test "bd_exists fails if bd is unregistered" {
+    git bd some_bd
+    git config --unset bd.some_bd.work-tree
+    ! bd_exists some_bd
+}

t/bd_registered.bats

@@ -0,0 +1,20 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+function setup {
+    init_repo
+}
+
+function teardown {
+    tempdir_cleanup
+}
+
+@test "bd_registered does find known bd" {
+    git bd some_bd
+    bd_registered some_bd
+}
+
+@test "bd_registered does not find unknown bd" {
+    ! bd_registered some_bd
+}

t/branch_exists.bats

@@ -0,0 +1,19 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+function setup {
+    init_repo
+}
+
+function teardown {
+    tempdir_cleanup
+}
+
+@test "branch_exists finds master" {
+    branch_exists master
+}
+
+@test "branch_exists does not find unknown_branch" {
+    ! branch_exists unknown_branch
+}

t/create.bats

@@ -0,0 +1,39 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+function setup {
+    init_repo
+}
+
+function teardown {
+    tempdir_cleanup
+}
+
+@test "create succeeds without start point" {
+    run git-bd foo
+    test "$status" -eq 0
+    bd_exists foo
+    test "$(sha_of foo)" = "$(sha_of master)"
+}
+
+@test "create succeeds with start point" {
+    git checkout -b foo
+    echo foo > README.md
+    git commit -m 'foo' README.md
+    git checkout master
+
+    run git-bd baz foo
+    test "$status" -eq 0
+    bd_exists baz
+    test "$(sha_of baz)"  = "$(sha_of foo)"
+    test "$(sha_of baz)" != "$(sha_of master)"
+}
+
+@test "create fails when start point doesn't exist" {
+    run git-bd baz foo
+    test "$status" -ne 0
+    ! bd_registered baz
+    ! branch_exists baz
+    ! work_tree_exists baz
+}

t/delete.bats

@@ -0,0 +1,127 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+function setup {
+    init_repo
+}
+
+function teardown {
+    tempdir_cleanup
+}
+
+@test "delete fails from the same bd" {
+    git-bd foo
+    cd "$TEMPDIR/foo"
+
+    bd_exists foo
+    run git-bd -df foo
+    test "$status" -ne 0
+    bd_exists foo
+}
+
+@test "delete succeeds when branch is merged" {
+    git-bd foo
+
+    bd_exists foo
+    run git-bd -df foo
+    test "$status" -eq 0
+    ! bd_registered foo
+    ! branch_exists foo
+    ! work_tree_exists foo
+}
+
+@test "delete fails when branch is unmerged" {
+    git-bd foo
+    cd "$TEMPDIR/foo"
+    echo foo > README.md
+    git commit -m 'foo' README.md
+    cd "$TEMPDIR/master"
+
+    bd_exists foo
+    run git-bd -df foo
+    test "$status" -ne 0
+    bd_registered foo
+    branch_exists foo
+    ! work_tree_exists foo
+}
+
+@test "force delete succeeds when branch is umerged" {
+    git-bd foo
+    cd "$TEMPDIR/foo"
+    echo foo > README.md
+    git commit -m 'foo' README.md
+    cd "$TEMPDIR/master"
+
+    bd_exists foo
+    run git-bd -Df foo
+    test "$status" -eq 0
+    ! bd_registered foo
+    ! branch_exists foo
+    ! work_tree_exists foo
+}
+
+@test "delete fails for unknown branchdir" {
+    run git-bd -df foo
+    test "$status" -ne 0
+    ! bd_registered foo
+    ! branch_exists foo
+    ! work_tree_exists foo
+}
+
+@test "delete with branch and work_tree already removed" {
+    git-bd foo
+
+    git branch -d foo
+    rm -rf "$TEMPDIR/foo"
+
+    bd_registered foo
+    run git-bd -df foo
+    test "$status" -eq 0
+    ! bd_registered foo
+    ! branch_exists foo
+    ! work_tree_exists foo
+}
+
+@test "delete with branch already removed" {
+    git-bd foo
+    bd_exists foo
+
+    git branch -d foo
+
+    bd_registered foo
+    work_tree_exists foo
+    run git-bd -df foo
+    test "$status" -eq 0
+    ! bd_registered foo
+    ! branch_exists foo
+    ! work_tree_exists foo
+}
+
+@test "delete with work_tree already removed" {
+    git-bd foo
+    rm -rf "$TEMPDIR/foo"
+
+    bd_registered foo
+    branch_exists foo
+    run git-bd -df foo
+    test "$status" -eq 0
+    ! bd_registered foo
+    ! branch_exists foo
+    ! work_tree_exists foo
+}
+
+@test "delete does not touch work_tree or branch if unregistered" {
+    git-bd foo
+
+    git config --unset bd.foo.work-tree
+
+    ! bd_registered foo
+    branch_exists foo
+    work_tree_exists foo
+    run git-bd -df foo
+    test "$status" -ne 0
+    ! bd_registered foo
+    branch_exists foo
+    work_tree_exists foo
+}