{"thread":{"id":"21772","subject":"[PATCH] t7508-status.sh: Add tests for status -s","startedAt":"2009-11-27T21:29:30Z","lastAt":"2009-11-27T21:29:30Z","messageCount":1,"participants":["Michael J Gruber"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"128609","messageId":"fe120e6f508634ed9061546fe7373c80d27cd376.1259357047.git.git@drmicha.warpmail.net","threadId":"21772","inReplyTo":null,"subject":"[PATCH] t7508-status.sh: Add tests for status -s","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2009-11-27T21:29:30Z","receivedAt":"2009-11-27T21:29:30Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"The new short status has been completely untested so far. Introduce\ntests by duplicating all tests which are present for the long format.\n\nSigned-off-by: Michael J Gruber <git@drmicha.warpmail.net>\n---\n t/t7508-status.sh |  166 +++++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 files changed, 166 insertions(+), 0 deletions(-)\n\nI think having them one by one (long, short, long, short, ...) makes more sense\nthan having them in separate files. But I'm not sure I should follow this\nstrategy when testing with color and with --porcelain as well. Maybe\nit's enough to duplicate a few tests only for --porcelain and with\ncolor?\n\ndiff --git a/t/t7508-status.sh b/t/t7508-status.sh\nindex 1173dbb..99a74bd 100755\n--- a/t/t7508-status.sh\n+++ b/t/t7508-status.sh\n@@ -68,6 +68,24 @@ test_expect_success 'status (2)' '\n \n '\n \n+cat > expect << \\EOF\n+ M dir1/modified\n+A  dir2/added\n+?? dir1/untracked\n+?? dir2/modified\n+?? dir2/untracked\n+?? expect\n+?? output\n+?? untracked\n+EOF\n+\n+test_expect_success 'status -s (2)' '\n+\n+\tgit status -s > output &&\n+\ttest_cmp expect output\n+\n+'\n+\n cat >expect <<EOF\n # On branch master\n # Changes to be committed:\n@@ -97,6 +115,22 @@ test_expect_success 'status (status.showUntrackedFiles no)' '\n \ttest_cmp expect output\n '\n \n+cat >expect << EOF\n+ M dir1/modified\n+A  dir2/added\n+EOF\n+test_expect_success 'status -s -uno' '\n+\tgit config --unset status.showuntrackedfiles\n+\tgit status -s -uno >output &&\n+\ttest_cmp expect output\n+'\n+\n+test_expect_success 'status -s (status.showUntrackedFiles no)' '\n+\tgit config status.showuntrackedfiles no\n+\tgit status -s >output &&\n+\ttest_cmp expect output\n+'\n+\n cat >expect <<EOF\n # On branch master\n # Changes to be committed:\n@@ -133,6 +167,29 @@ test_expect_success 'status (status.showUntrackedFiles normal)' '\n '\n \n cat >expect <<EOF\n+ M dir1/modified\n+A  dir2/added\n+?? dir1/untracked\n+?? dir2/modified\n+?? dir2/untracked\n+?? dir3/\n+?? expect\n+?? output\n+?? untracked\n+EOF\n+test_expect_success 'status -s -unormal' '\n+\tgit config --unset status.showuntrackedfiles\n+\tgit status -s -unormal >output &&\n+\ttest_cmp expect output\n+'\n+\n+test_expect_success 'status -s (status.showUntrackedFiles normal)' '\n+\tgit config status.showuntrackedfiles normal\n+\tgit status -s >output &&\n+\ttest_cmp expect output\n+'\n+\n+cat >expect <<EOF\n # On branch master\n # Changes to be committed:\n #   (use \"git reset HEAD <file>...\" to unstage)\n@@ -169,6 +226,29 @@ test_expect_success 'status (status.showUntrackedFiles all)' '\n \ttest_cmp expect output\n '\n \n+cat >expect <<EOF\n+ M dir1/modified\n+A  dir2/added\n+?? dir1/untracked\n+?? dir2/modified\n+?? dir2/untracked\n+?? expect\n+?? output\n+?? untracked\n+EOF\n+test_expect_success 'status -s -uall' '\n+\tgit config --unset status.showuntrackedfiles\n+\tgit status -s -uall >output &&\n+\ttest_cmp expect output\n+'\n+test_expect_success 'status -s (status.showUntrackedFiles all)' '\n+\tgit config status.showuntrackedfiles all\n+\tgit status -s >output &&\n+\trm -rf dir3 &&\n+\tgit config --unset status.showuntrackedfiles &&\n+\ttest_cmp expect output\n+'\n+\n cat > expect << \\EOF\n # On branch master\n # Changes to be committed:\n@@ -201,6 +281,23 @@ test_expect_success 'status with relative paths' '\n '\n \n cat > expect << \\EOF\n+ M modified\n+A  ../dir2/added\n+?? untracked\n+?? ../dir2/modified\n+?? ../dir2/untracked\n+?? ../expect\n+?? ../output\n+?? ../untracked\n+EOF\n+test_expect_success 'status -s with relative paths' '\n+\n+\t(cd dir1 && git status -s) > output &&\n+\ttest_cmp expect output\n+\n+'\n+\n+cat > expect << \\EOF\n # On branch master\n # Changes to be committed:\n #   (use \"git reset HEAD <file>...\" to unstage)\n@@ -232,6 +329,24 @@ test_expect_success 'status without relative paths' '\n \n '\n \n+cat > expect << \\EOF\n+ M dir1/modified\n+A  dir2/added\n+?? dir1/untracked\n+?? dir2/modified\n+?? dir2/untracked\n+?? expect\n+?? output\n+?? untracked\n+EOF\n+\n+test_expect_success 'status -s without relative paths' '\n+\n+\t(cd dir1 && git status -s) > output &&\n+\ttest_cmp expect output\n+\n+'\n+\n cat <<EOF >expect\n # On branch master\n # Changes to be committed:\n@@ -298,6 +413,28 @@ test_expect_success 'status --untracked-files=all does not show submodule' '\n \ttest_cmp expect output\n '\n \n+cat >expect <<EOF\n+ M dir1/modified\n+A  dir2/added\n+A  sm\n+?? dir1/untracked\n+?? dir2/modified\n+?? dir2/untracked\n+?? expect\n+?? output\n+?? untracked\n+EOF\n+test_expect_success 'status -s submodule summary is disabled by default' '\n+\tgit status -s >output &&\n+\ttest_cmp expect output\n+'\n+\n+# we expect the same as the previous test\n+test_expect_success 'status -s --untracked-files=all does not show submodule' '\n+\tgit status -s --untracked-files=all >output &&\n+\ttest_cmp expect output\n+'\n+\n head=$(cd sm && git rev-parse --short=7 --verify HEAD)\n \n cat >expect <<EOF\n@@ -335,6 +472,21 @@ test_expect_success 'status submodule summary' '\n \ttest_cmp expect output\n '\n \n+cat >expect <<EOF\n+ M dir1/modified\n+A  dir2/added\n+A  sm\n+?? dir1/untracked\n+?? dir2/modified\n+?? dir2/untracked\n+?? expect\n+?? output\n+?? untracked\n+EOF\n+test_expect_success 'status -s submodule summary' '\n+\tgit status -s >output &&\n+\ttest_cmp expect output\n+'\n \n cat >expect <<EOF\n # On branch master\n@@ -365,6 +517,20 @@ test_expect_success 'status submodule summary (clean submodule)' '\n '\n \n cat >expect <<EOF\n+ M dir1/modified\n+?? dir1/untracked\n+?? dir2/modified\n+?? dir2/untracked\n+?? expect\n+?? output\n+?? untracked\n+EOF\n+test_expect_success 'status -s submodule summary (clean submodule)' '\n+\tgit status -s >output &&\n+\ttest_cmp expect output\n+'\n+\n+cat >expect <<EOF\n # On branch master\n # Changes to be committed:\n #   (use \"git reset HEAD^1 <file>...\" to unstage)\n-- \n1.6.6.rc0.274.g71380\n"}]}