Skip to content

Commit d87441f

Browse files
committed
ignore: move tests from status to attr ignore suite
1 parent b50e448 commit d87441f

File tree

2 files changed

+25
-40
lines changed

2 files changed

+25
-40
lines changed

tests/attr/ignore.c

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,3 +372,28 @@ void test_attr_ignore__case_sensitive_unignore_does_nothing(void)
372372

373373
assert_is_ignored(true, "case/file");
374374
}
375+
376+
void test_attr_ignore__ignored_subdirfiles_with_subdir_rule(void)
377+
{
378+
cl_git_rewritefile(
379+
"attr/.gitignore",
380+
"dir/*\n"
381+
"!dir/sub1/sub2/**\n");
382+
383+
assert_is_ignored(true, "dir/a.test");
384+
assert_is_ignored(true, "dir/sub1/a.test");
385+
assert_is_ignored(true, "dir/sub1/sub2");
386+
}
387+
388+
void test_attr_ignore__ignored_subdirfiles_with_negations(void)
389+
{
390+
cl_git_rewritefile(
391+
"attr/.gitignore",
392+
"dir/*\n"
393+
"!dir/a.test\n");
394+
395+
assert_is_ignored(false, "dir/a.test");
396+
assert_is_ignored(true, "dir/b.test");
397+
assert_is_ignored(true, "dir/sub1/c.test");
398+
}
399+

tests/status/ignore.c

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,43 +1213,3 @@ void test_status_ignore__unignored_subdirs(void)
12131213
assert_is_ignored("dir/a.test");
12141214
refute_is_ignored("dir/subdir/a.test");
12151215
}
1216-
1217-
void test_status_ignore__ignored_subdirfiles_with_subdir_rule(void)
1218-
{
1219-
static const char *test_files[] = {
1220-
"empty_standard_repo/dir/a.test",
1221-
"empty_standard_repo/dir/sub1/sub2/b.test",
1222-
NULL
1223-
};
1224-
1225-
make_test_data("empty_standard_repo", test_files);
1226-
cl_git_mkfile(
1227-
"empty_standard_repo/.gitignore",
1228-
"dir/*\n"
1229-
"!dir/sub1/sub2/**\n");
1230-
1231-
assert_is_ignored("dir/a.test");
1232-
assert_is_ignored("dir/sub1/a.test");
1233-
assert_is_ignored("dir/sub1/sub2");
1234-
assert_is_ignored("dir/sub1/sub2/b.test");
1235-
}
1236-
1237-
void test_status_ignore__ignored_subdirfiles_with_negations(void)
1238-
{
1239-
static const char *test_files[] = {
1240-
"empty_standard_repo/dir/a.test",
1241-
"empty_standard_repo/dir/b.test",
1242-
"empty_standard_repo/dir/sub1/c.test",
1243-
NULL
1244-
};
1245-
1246-
make_test_data("empty_standard_repo", test_files);
1247-
cl_git_mkfile(
1248-
"empty_standard_repo/.gitignore",
1249-
"dir/*\n"
1250-
"!dir/a.test\n");
1251-
1252-
refute_is_ignored("dir/a.test");
1253-
assert_is_ignored("dir/b.test");
1254-
assert_is_ignored("dir/sub1/c.test");
1255-
}

0 commit comments

Comments
 (0)