mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.promise: Remove some redundant checks, add tests confirming redundancy

Browse source 
This lines don't appear to do anything useful, and all tests pass when they
are removed. Discovered via mutation testing.

I added extra tests to exercise this code, because I wasn't certain that there
were no side-effects caused by removal. Everything appears to be fine, thanks
to the "pending" check at the start of promise_settle().
This commit is contained in:
Matthew Wild 2022-10-07 17:43:26 +01:00
parent d08ddc1f4a
commit aed0c1c5ab
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
spec/util_promise_spec.lua
View file

@ -30,6 +30,27 @@ describe("util.promise", function ()
r("foo");
assert.spy(cb).was_called(1);
end);
it("ignores resolve/reject of settled promises", function ()
local res, rej;
local p = promise.new(function (resolve, reject)
res, rej = resolve, reject;
end);
local cb = spy.new(function (v)
assert.equal("foo", v);
end);
p:next(cb, cb);
assert.spy(cb).was_called(0);
res("foo");
assert.spy(cb).was_called(1);
rej("bar");
assert.spy(cb).was_called(1);
rej(promise.resolve("bar"));
assert.spy(cb).was_called(1);
res(promise.reject("bar"));
assert.spy(cb).was_called(1);
res(promise.resolve("bar"));
assert.spy(cb).was_called(1);
end);
it("allows chaining :next() calls", function ()
local r;
local result;

4
util/promise.lua
View file

@ -57,9 +57,7 @@ local function promise_settle(promise, new_state, new_next, cbs, value)
end
local function new_resolve_functions(p)
local resolved = false;
local function _resolve(v)
if resolved then return; end
resolved = true;
if is_promise(v) then
v:next(new_resolve_functions(p));
@ -69,8 +67,6 @@ local function new_resolve_functions(p)
end
local function _reject(e)
if resolved then return; end
resolved = true;
if promise_settle(p, "rejected", next_rejected, p._pending_on_rejected, e) then
p.reason = e;
end