diff options
| author | Steven King Jr <stevek@axosoft.com> | 2019-03-20 13:24:07 -0700 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2019-05-02 10:22:12 +0200 |
| commit | 1df7d27addb1135bbd189257ebe39dff033d2118 (patch) | |
| tree | 27d58433a6efb0b485efd36135bb955dce26f267 | |
| parent | 93971ca6cdd9584349d03d900f1c0b65375227c5 (diff) | |
| download | libgit2-1df7d27addb1135bbd189257ebe39dff033d2118.tar.gz | |
ignore: move tests from status to attr ignore suite
| -rw-r--r-- | tests/attr/ignore.c | 25 | ||||
| -rw-r--r-- | tests/status/ignore.c | 40 |
2 files changed, 25 insertions, 40 deletions
diff --git a/tests/attr/ignore.c b/tests/attr/ignore.c index 165e2ba09..110304a81 100644 --- a/tests/attr/ignore.c +++ b/tests/attr/ignore.c @@ -372,3 +372,28 @@ void test_attr_ignore__case_sensitive_unignore_does_nothing(void) assert_is_ignored(true, "case/file"); } + +void test_attr_ignore__ignored_subdirfiles_with_subdir_rule(void) +{ + cl_git_rewritefile( + "attr/.gitignore", + "dir/*\n" + "!dir/sub1/sub2/**\n"); + + assert_is_ignored(true, "dir/a.test"); + assert_is_ignored(true, "dir/sub1/a.test"); + assert_is_ignored(true, "dir/sub1/sub2"); +} + +void test_attr_ignore__ignored_subdirfiles_with_negations(void) +{ + cl_git_rewritefile( + "attr/.gitignore", + "dir/*\n" + "!dir/a.test\n"); + + assert_is_ignored(false, "dir/a.test"); + assert_is_ignored(true, "dir/b.test"); + assert_is_ignored(true, "dir/sub1/c.test"); +} + diff --git a/tests/status/ignore.c b/tests/status/ignore.c index a6045b8e9..496582136 100644 --- a/tests/status/ignore.c +++ b/tests/status/ignore.c @@ -1213,43 +1213,3 @@ void test_status_ignore__unignored_subdirs(void) assert_is_ignored("dir/a.test"); refute_is_ignored("dir/subdir/a.test"); } - -void test_status_ignore__ignored_subdirfiles_with_subdir_rule(void) -{ - static const char *test_files[] = { - "empty_standard_repo/dir/a.test", - "empty_standard_repo/dir/sub1/sub2/b.test", - NULL - }; - - make_test_data("empty_standard_repo", test_files); - cl_git_mkfile( - "empty_standard_repo/.gitignore", - "dir/*\n" - "!dir/sub1/sub2/**\n"); - - assert_is_ignored("dir/a.test"); - assert_is_ignored("dir/sub1/a.test"); - assert_is_ignored("dir/sub1/sub2"); - assert_is_ignored("dir/sub1/sub2/b.test"); -} - -void test_status_ignore__ignored_subdirfiles_with_negations(void) -{ - static const char *test_files[] = { - "empty_standard_repo/dir/a.test", - "empty_standard_repo/dir/b.test", - "empty_standard_repo/dir/sub1/c.test", - NULL - }; - - make_test_data("empty_standard_repo", test_files); - cl_git_mkfile( - "empty_standard_repo/.gitignore", - "dir/*\n" - "!dir/a.test\n"); - - refute_is_ignored("dir/a.test"); - assert_is_ignored("dir/b.test"); - assert_is_ignored("dir/sub1/c.test"); -} |