aboutsummaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2020-10-15 14:25:09 +0100
committerMatthew Wild <mwild1@gmail.com>2020-10-15 14:25:09 +0100
commit4f4140fbc363160f859292c8b1eccd701ad7b1e1 (patch)
treeb5dbcad554882e92268cdfdc1df7b2664677dcf0 /spec
parent58e33e399553ccc457de266c36102308f63bfe02 (diff)
parent64856637cee81b916cc240c55657eb13c0763620 (diff)
downloadprosody-4f4140fbc363160f859292c8b1eccd701ad7b1e1.tar.gz
prosody-4f4140fbc363160f859292c8b1eccd701ad7b1e1.zip
Merge 0.11->trunk
Diffstat (limited to 'spec')
-rw-r--r--spec/net_websocket_frames_spec.lua18
1 files changed, 14 insertions, 4 deletions
diff --git a/spec/net_websocket_frames_spec.lua b/spec/net_websocket_frames_spec.lua
index 7eed73c9..7c7d8f05 100644
--- a/spec/net_websocket_frames_spec.lua
+++ b/spec/net_websocket_frames_spec.lua
@@ -32,16 +32,25 @@ describe("net.websocket.frames", function ()
["RSV2"] = false;
["RSV3"] = false;
};
- masked_data = {
+ with_mask = {
["opcode"] = 0;
["length"] = 5;
["data"] = "hello";
+ ["key"] = " \0 \0";
+ ["FIN"] = true;
+ ["MASK"] = true;
+ ["RSV1"] = false;
+ ["RSV2"] = false;
+ ["RSV3"] = false;
+ };
+ empty_with_mask = {
+ ["opcode"] = 0;
+ ["key"] = " \0 \0";
["FIN"] = true;
["MASK"] = true;
["RSV1"] = false;
["RSV2"] = false;
["RSV3"] = false;
- ["key"] = { 0x20, 0x20, 0x20, 0x20, };
};
ping = {
["opcode"] = 0x9;
@@ -71,7 +80,8 @@ describe("net.websocket.frames", function ()
assert.equal("\0\0", build(test_frames.simple_empty));
assert.equal("\0\5hello", build(test_frames.simple_data));
assert.equal("\128\0", build(test_frames.simple_fin));
- assert.equal("\128\133 HELLO", build(test_frames.masked_data));
+ assert.equal("\128\133 \0 \0HeLlO", build(test_frames.with_mask))
+ assert.equal("\128\128 \0 \0", build(test_frames.empty_with_mask))
assert.equal("\137\4ping", build(test_frames.ping));
assert.equal("\138\4pong", build(test_frames.pong));
end);
@@ -83,7 +93,7 @@ describe("net.websocket.frames", function ()
assert.same(test_frames.simple_empty, parse("\0\0"));
assert.same(test_frames.simple_data, parse("\0\5hello"));
assert.same(test_frames.simple_fin, parse("\128\0"));
- assert.same(test_frames.masked_data, parse("\128\133 HELLO"));
+ assert.same(test_frames.with_mask, parse("\128\133 \0 \0HeLlO"));
assert.same(test_frames.ping, parse("\137\4ping"));
assert.same(test_frames.pong, parse("\138\4pong"));
end);