From 3402c8818bf0768e971f1bac629500f943d8fa8b Mon Sep 17 00:00:00 2001 From: Taleh Zaliyev Date: Fri, 11 Apr 2025 19:39:18 +0300 Subject: [PATCH] Fix error messages for Frame --- lib/protocol/websocket/frame.rb | 4 ++-- test/protocol/websocket/frame.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/protocol/websocket/frame.rb b/lib/protocol/websocket/frame.rb index 5e41eca..07730a1 100644 --- a/lib/protocol/websocket/frame.rb +++ b/lib/protocol/websocket/frame.rb @@ -185,7 +185,7 @@ def self.read(finished, flags, opcode, stream, maximum_frame_size) end if length > maximum_frame_size - raise ProtocolError, "Invalid payload length: #{@length} > #{maximum_frame_size}!" + raise ProtocolError, "Invalid payload length: #{length} > #{maximum_frame_size}!" end if mask @@ -195,7 +195,7 @@ def self.read(finished, flags, opcode, stream, maximum_frame_size) payload = stream.read(length) or raise EOFError, "Could not read payload!" if payload.bytesize != length - raise EOFError, "Incorrect payload length: #{@length} != #{payload.bytesize}!" + raise EOFError, "Incorrect payload length: #{length} != #{payload.bytesize}!" end return self.new(finished, payload, flags: flags, opcode: opcode, mask: mask) diff --git a/test/protocol/websocket/frame.rb b/test/protocol/websocket/frame.rb index e8cf222..2608ac3 100644 --- a/test/protocol/websocket/frame.rb +++ b/test/protocol/websocket/frame.rb @@ -64,7 +64,7 @@ expect do subject.read(false, 0, 0, stream, 124) - end.to raise_exception(Protocol::WebSocket::ProtocolError, message: be =~ /Invalid payload length/) + end.to raise_exception(Protocol::WebSocket::ProtocolError, message: be =~ /Invalid payload length: \d+ > \d*!/) end it "rejects frames with truncated payload" do @@ -72,7 +72,7 @@ expect do subject.read(false, 0, 0, stream, 128) - end.to raise_exception(EOFError, message: be =~ /Incorrect payload length/) + end.to raise_exception(EOFError, message: be =~ /Incorrect payload length: \d+ != \d+!/) end end