diff --git a/lua/telescope-jj/conflicts.test.lua b/lua/telescope-jj/conflicts.test.lua index 632af72..f4e95aa 100644 --- a/lua/telescope-jj/conflicts.test.lua +++ b/lua/telescope-jj/conflicts.test.lua @@ -1,12 +1,12 @@ -local s1 = "file two-sided conflict" -local s2 = "file two-sided conflict" -local s3 = "file two-sided conflict" -local s4 = "file three-sided conflict" -local s5 = "file two-sided conflict two-sided conflict" +local s1 = "file 2-sided conflict" +local s2 = "file 2-sided conflict" +local s3 = "file 2-sided conflict" +local s4 = "file 3-sided conflict" +local s5 = "file 2-sided conflict 2-sided conflict" -local pattern = "^(.-)%s+%a+%-sided conflict$" +local pattern = "^(.-)%s+%d+%-sided conflict$" assert(string.match(s1, pattern) == "file") assert(string.match(s2, pattern) == "file") assert(string.match(s3, pattern) == "file") assert(string.match(s4, pattern) == "file") -assert(string.match(s5, pattern) == "file two-sided conflict") +assert(string.match(s5, pattern) == "file 2-sided conflict")