Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/websocket/extensions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ def generate_offer
end

@sessions = sessions
@client_sessions = sessions
@index = index

offer.size > 0 ? offer.join(', ') : nil
Expand Down Expand Up @@ -157,7 +158,10 @@ def process_outgoing_message(message)
def close
return unless @sessions

@sessions.each do |ext, session|
sessions = @client_sessions || @sessions
@client_sessions, @sessions = nil, []

sessions.each do |ext, session|
session.close rescue nil
end
end
Expand Down
16 changes: 16 additions & 0 deletions spec/websocket/extensions_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,22 @@
end
end

describe :close do
before do
@extensions.add(@nonconflict)
@extensions.generate_offer
@extensions.activate("deflate")
end

it "closes selected and unselected sessions only once" do
expect(@session).to receive(:close).exactly(1)
expect(@nonconflict_session).to receive(:close).exactly(1)

@extensions.close
@extensions.close
end
end

describe :process_incoming_message do
before do
@extensions.add(@conflict)
Expand Down