aboutsummaryrefslogtreecommitdiffstats
path: root/spec/util_human_io_spec.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2023-11-30 13:42:44 +0000
committerMatthew Wild <mwild1@gmail.com>2023-11-30 13:42:44 +0000
commita669ffb5a2ea3d73e7f7c460deef52579d5ba57b (patch)
tree93196b86d1773a8310a596d4a1e9d709c2cd87e8 /spec/util_human_io_spec.lua
parent56d45091bdcc75292a73a789a017b36721efa2e6 (diff)
downloadprosody-a669ffb5a2ea3d73e7f7c460deef52579d5ba57b.tar.gz
prosody-a669ffb5a2ea3d73e7f7c460deef52579d5ba57b.zip
util.human.io: Don't accept ambiguous durations by default
The new method parse_duration_lax() exports the old behaviour, mainly for compatibility purposes.
Diffstat (limited to 'spec/util_human_io_spec.lua')
-rw-r--r--spec/util_human_io_spec.lua33
1 files changed, 32 insertions, 1 deletions
diff --git a/spec/util_human_io_spec.lua b/spec/util_human_io_spec.lua
index be850a96..91a87b39 100644
--- a/spec/util_human_io_spec.lua
+++ b/spec/util_human_io_spec.lua
@@ -47,6 +47,37 @@ describe("util.human.io", function ()
local function test(expected, duration)
return assert.equal(expected, human_io.parse_duration(duration), ("%q -> %d"):format(duration, expected));
end
+ local function should_fail(duration)
+ assert.is_nil(human_io.parse_duration(duration), "invalid duration should fail: %q");
+ end
+ it("works", function ()
+ test(1, "1s");
+ test(60, "1min");
+ test(60, "1 min");
+ test(60, "1 minute");
+ test(120, "2min");
+ test(7200, "2h");
+ test(7200, "2 hours");
+ test(86400, "1d");
+ test(604800, "1w");
+ test(604800, "1week");
+ test(1814400, "3 weeks");
+ test(2678400, "1month");
+ test(2678400, "1 month");
+ test(31536000, "365 days");
+ test(31556952, "1 year");
+
+ should_fail("two weeks");
+ should_fail("1m");
+ should_fail("1mi");
+ should_fail("1mo");
+ end);
+ end);
+
+ describe("parse_duration_lax", function ()
+ local function test(expected, duration)
+ return assert.equal(expected, human_io.parse_duration_lax(duration), ("%q -> %d"):format(duration, expected));
+ end
it("works", function ()
test(1, "1s");
test(60, "1mi");
@@ -66,7 +97,7 @@ describe("util.human.io", function ()
test(2678400, "1 month");
test(31536000, "365 days");
test(31556952, "1 year");
- return assert.is_nil(human_io.parse_duration("two weeks"), "\"2 weeks\" -> nil");
+ return assert.is_nil(human_io.parse_duration_lax("two weeks"), "\"2 weeks\" -> nil");
end);
end);
end);