util.promise: all()/all_settled() pass through non-promise values

1 files changed, 33 insertions, 0 deletions

diff --git a/spec/util_promise_spec.lua b/spec/util_promise_spec.lua
index 79eec5e2..f64702bf 100644
--- a/spec/util_promise_spec.lua
+++ b/spec/util_promise_spec.lua
@@ -369,6 +369,21 @@ describe("util.promise", function ()
 			assert.spy(cb).was_called(1);
 			assert.same({ [true] = "nope", [false] = "yep" }, result);
 		end);
+		it("passes through non-promise values", function ()
+			local r1;
+			local p1 = promise.new(function (resolve) r1 = resolve end);
+			local p = promise.all({ [true] = p1, [false] = "yep" });
+
+			local result;
+			local cb = spy.new(function (v)
+				result = v;
+			end);
+			p:next(cb);
+			assert.spy(cb).was_called(0);
+			r1("nope");
+			assert.spy(cb).was_called(1);
+			assert.same({ [true] = "nope", [false] = "yep" }, result);
+		end);
 	end);
 	describe("all_settled()", function ()
 		it("works with fulfilled promises", function ()
@@ -443,6 +458,24 @@ describe("util.promise", function ()
 				bar = { status = "fulfilled", value = "yep" };
 			}, result);
 		end);
+		it("passes through non-promise values", function ()
+			local r1;
+			local p1 = promise.new(function (resolve) r1 = resolve end);
+			local p = promise.all_settled({ foo = p1, bar = "yep" });
+
+			local result;
+			local cb = spy.new(function (v)
+				result = v;
+			end);
+			p:next(cb);
+			assert.spy(cb).was_called(0);
+			r1("nope");
+			assert.spy(cb).was_called(1);
+			assert.same({
+				foo = { status = "fulfilled", value = "nope" };
+				bar = "yep";
+			}, result);
+		end);
 	end);
 	describe("catch()", function ()
 		it("works", function ()