aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-05-18 15:20:32 +0100
committerMatthew Wild <mwild1@gmail.com>2018-05-18 15:20:32 +0100
commitd75ceb7e996ccd2fbe4e0c30ec75d17d327044ee (patch)
tree6161334b25afbbe0d76fcec605589655d995f501
parentc9034dfeadbe979c3a7ba9ad7bd5f78907383687 (diff)
downloadprosody-d75ceb7e996ccd2fbe4e0c30ec75d17d327044ee.tar.gz
prosody-d75ceb7e996ccd2fbe4e0c30ec75d17d327044ee.zip
Fix wrong tests committed with 7b621a4a2e8d
-rw-r--r--spec/util_events_spec.lua21
-rw-r--r--spec/util_iterators_spec.lua15
2 files changed, 15 insertions, 21 deletions
diff --git a/spec/util_events_spec.lua b/spec/util_events_spec.lua
index e8bce737..fee60f8f 100644
--- a/spec/util_events_spec.lua
+++ b/spec/util_events_spec.lua
@@ -208,26 +208,5 @@ describe("util.events", function ()
assert.spy(h).was_called(2);
end);
end);
-
- describe("chaining", function ()
- local e2;
- before_each(function ()
- e2 = events.new(e);
- h2 = spy.new(function () end);
- end);
- it("should fire parent handlers when an event is fired", function ()
- e.add_handler("myevent", h);
- e2.add_handler("myevent", h2);
- e2.fire_event("myevent", "abc");
- assert.spy(h).was_called(1);
- assert.spy(h).was_called.with("abc");
- assert.spy(h2).was_called(1);
- assert.spy(h2).was_called.with("abc");
- end);
- it("should handle changes in the parent's handlers", function ()
- end);
- it("should fire wrappers in child and parent", function ()
- end);
- end);
end);
end);
diff --git a/spec/util_iterators_spec.lua b/spec/util_iterators_spec.lua
new file mode 100644
index 00000000..63835b12
--- /dev/null
+++ b/spec/util_iterators_spec.lua
@@ -0,0 +1,15 @@
+local iter = require "util.iterators";
+local set = require "util.set";
+
+describe("util.iterators", function ()
+ describe("join", function ()
+ it("should produce a joined iterator", function ()
+ local expect = { "a", "b", "c", 1, 2, 3 };
+ local output = {};
+ for x in iter.join(iter.values({"a", "b", "c"})):append(iter.values({1, 2, 3})) do
+ table.insert(output, x);
+ end
+ assert.same(output, expect);
+ end);
+ end);
+end);