websocket 1.2.4 → 1.2.5

data/spec/frame/incoming_04_spec.rb

@@ -1,14 +1,15 @@
 # encoding: binary
+
 require 'spec_helper'
 
 RSpec.describe 'Incoming frame draft 04' do
+  subject { frame }
   let(:version) { 4 }
   let(:frame) { WebSocket::Frame::Incoming.new(version: version, data: encoded_text) }
   let(:encoded_text) { nil }
   let(:decoded_text) { nil }
   let(:frame_type) { nil }
   let(:error) { nil }
-  subject { frame }
 
   it_should_behave_like 'valid_incoming_frame'
 
@@ -54,7 +55,7 @@ RSpec.describe 'Incoming frame draft 04' do
 
   context 'should properly decode text frame in between of continuation' do
     let(:encoded_text) { "\x04\x03Hel\x83\x03abc\x80\x02lo" }
-    let(:frame_type)   { [:pong, :text] }
+    let(:frame_type)   { %i(pong text) }
     let(:decoded_text) { %w(abc Hello) }
 
     it_should_behave_like 'valid_incoming_frame'

data/spec/frame/incoming_05_spec.rb

@@ -1,14 +1,15 @@
 # encoding: binary
+
 require 'spec_helper'
 
 RSpec.describe 'Incoming frame draft 05' do
+  subject { frame }
   let(:version) { 5 }
   let(:frame) { WebSocket::Frame::Incoming.new(version: version, data: encoded_text) }
   let(:encoded_text) { nil }
   let(:decoded_text) { nil }
   let(:frame_type) { nil }
   let(:error) { nil }
-  subject { frame }
 
   it_should_behave_like 'valid_incoming_frame'
 
@@ -70,7 +71,7 @@ RSpec.describe 'Incoming frame draft 05' do
 
   context 'should properly decode text frame in between of continuation' do
     let(:encoded_text) { "\x04\x03Hel\x83\x03abc\x80\x02lo" }
-    let(:frame_type)   { [:pong, :text] }
+    let(:frame_type)   { %i(pong text) }
     let(:decoded_text) { %w(abc Hello) }
 
     it_should_behave_like 'valid_incoming_frame'

data/spec/frame/incoming_07_spec.rb

@@ -1,14 +1,15 @@
 # encoding: binary
+
 require 'spec_helper'
 
 RSpec.describe 'Incoming frame draft 07' do
+  subject { frame }
   let(:version) { 7 }
   let(:frame) { WebSocket::Frame::Incoming.new(version: version, data: encoded_text) }
   let(:encoded_text) { nil }
   let(:decoded_text) { nil }
   let(:frame_type) { nil }
   let(:error) { nil }
-  subject { frame }
 
   it_should_behave_like 'valid_incoming_frame'
 
@@ -87,7 +88,7 @@ RSpec.describe 'Incoming frame draft 07' do
 
   context 'should properly decode text frame in between of continuation' do
     let(:encoded_text) { "\x01\x03Hel\x8a\x03abc\x80\x02lo" }
-    let(:frame_type)   { [:pong, :text] }
+    let(:frame_type)   { %i(pong text) }
     let(:decoded_text) { %w(abc Hello) }
 
     it_should_behave_like 'valid_incoming_frame'

data/spec/frame/incoming_75_spec.rb

@@ -1,14 +1,15 @@
 # encoding: binary
+
 require 'spec_helper'
 
 RSpec.describe 'Incoming frame draft 75' do
+  subject { frame }
   let(:version) { 75 }
   let(:frame) { WebSocket::Frame::Incoming.new(version: version, data: encoded_text) }
   let(:encoded_text) { nil }
   let(:decoded_text) { nil }
   let(:frame_type) { nil }
   let(:error) { nil }
-  subject { frame }
 
   it_should_behave_like 'valid_incoming_frame'
 
@@ -23,7 +24,7 @@ RSpec.describe 'Incoming frame draft 75' do
   context 'with two frames' do
     let(:encoded_text) { "\x00abc\xFF\x00def\xFF" }
     let(:decoded_text) { %w(abc def) }
-    let(:frame_type)   { [:text, :text] }
+    let(:frame_type)   { %i(text text) }
 
     it_should_behave_like 'valid_incoming_frame'
   end

data/spec/frame/incoming_common_spec.rb

@@ -1,22 +1,31 @@
 # encoding: binary
+
 require 'spec_helper'
 
 RSpec.describe 'Incoming common frame' do
   subject { WebSocket::Frame::Incoming.new }
 
-  its(:version) { is_expected.to eql(13) }
-  its(:decoded?) { is_expected.to be false }
-  its(:error?) { is_expected.to be false }
+  it 'is version 13' do
+    expect(subject.version).to be 13
+  end
+
+  it 'is not decoded' do
+    expect(subject.decoded?).to be false
+  end
+
+  it 'has no errors' do
+    expect(subject.error?).to be false
+  end
 
-  it 'should allow adding data via <<' do
-    expect(subject.data).to eql('')
+  it 'allows adding data via <<' do
+    expect(subject.data).to eql ''
     subject << 'test'
-    expect(subject.data).to eql('test')
+    expect(subject.data).to eql 'test'
   end
 
-  it 'should raise error on invalid version' do
+  it 'raises error on invalid version' do
     subject = WebSocket::Frame::Incoming.new(version: 70)
     expect(subject.error?).to be true
-    expect(subject.error).to eql(:unknown_protocol_version)
+    expect(subject.error).to be :unknown_protocol_version
   end
 end

data/spec/frame/masking_spec.rb

@@ -1,8 +1,9 @@
 # encoding: binary
+
 require 'spec_helper'
 
 RSpec.describe 'Masking frame draft 07' do
-  it 'should encode and decode masked frame correctly' do
+  it 'encodes and decode masked frame correctly' do
     outgoing_frame = WebSocket::Frame::Outgoing::Client.new(data: 'Hello World', type: 'text')
     outgoing_frame.to_s
     expect(outgoing_frame.error).to be_nil

data/spec/frame/outgoing_03_spec.rb

@@ -1,7 +1,9 @@
 # encoding: binary
+
 require 'spec_helper'
 
 RSpec.describe 'Outgoing frame draft 03' do
+  subject { frame }
   let(:version) { 3 }
   let(:frame) { WebSocket::Frame::Outgoing.new(version: version, data: decoded_text, type: frame_type) }
   let(:decoded_text) { '' }
@@ -9,7 +11,6 @@ RSpec.describe 'Outgoing frame draft 03' do
   let(:frame_type) { :text }
   let(:require_sending) { true }
   let(:error) { nil }
-  subject { frame }
 
   it_should_behave_like 'valid_outgoing_frame'
 

data/spec/frame/outgoing_04_spec.rb

@@ -1,7 +1,9 @@
 # encoding: binary
+
 require 'spec_helper'
 
 RSpec.describe 'Outgoing frame draft 04' do
+  subject { frame }
   let(:version) { 4 }
   let(:frame) { WebSocket::Frame::Outgoing.new(version: version, data: decoded_text, type: frame_type) }
   let(:decoded_text) { '' }
@@ -9,7 +11,6 @@ RSpec.describe 'Outgoing frame draft 04' do
   let(:frame_type) { :text }
   let(:require_sending) { true }
   let(:error) { nil }
-  subject { frame }
 
   it_should_behave_like 'valid_outgoing_frame'
 

data/spec/frame/outgoing_05_spec.rb

@@ -1,7 +1,9 @@
 # encoding: binary
+
 require 'spec_helper'
 
 RSpec.describe 'Outgoing frame draft 05' do
+  subject { frame }
   let(:version) { 5 }
   let(:frame) { WebSocket::Frame::Outgoing.new(version: version, data: decoded_text, type: frame_type) }
   let(:decoded_text) { '' }
@@ -9,7 +11,6 @@ RSpec.describe 'Outgoing frame draft 05' do
   let(:frame_type) { :text }
   let(:require_sending) { true }
   let(:error) { nil }
-  subject { frame }
 
   it_should_behave_like 'valid_outgoing_frame'
 

data/spec/frame/outgoing_07_spec.rb

@@ -1,7 +1,9 @@
 # encoding: binary
+
 require 'spec_helper'
 
 RSpec.describe 'Outgoing frame draft 07' do
+  subject { frame }
   let(:version) { 7 }
   let(:frame) { WebSocket::Frame::Outgoing.new(version: version, data: decoded_text, type: frame_type, code: close_code) }
   let(:decoded_text) { '' }
@@ -10,7 +12,6 @@ RSpec.describe 'Outgoing frame draft 07' do
   let(:frame_type) { :text }
   let(:require_sending) { true }
   let(:error) { nil }
-  subject { frame }
 
   it_should_behave_like 'valid_outgoing_frame'
 

data/spec/frame/outgoing_75_spec.rb

@@ -1,7 +1,9 @@
 # encoding: binary
+
 require 'spec_helper'
 
 RSpec.describe 'Outgoing frame draft 75' do
+  subject { frame }
   let(:version) { 75 }
   let(:frame) { WebSocket::Frame::Outgoing.new(version: version, data: decoded_text, type: frame_type) }
   let(:decoded_text) { '' }
@@ -9,7 +11,6 @@ RSpec.describe 'Outgoing frame draft 75' do
   let(:frame_type) { :text }
   let(:require_sending) { true }
   let(:error) { nil }
-  subject { frame }
 
   it_should_behave_like 'valid_outgoing_frame'
 

data/spec/frame/outgoing_common_spec.rb

@@ -1,15 +1,21 @@
 # encoding: binary
+
 require 'spec_helper'
 
 RSpec.describe 'Outgoing common frame' do
   subject { WebSocket::Frame::Outgoing.new }
 
-  its(:version) { is_expected.to eql(13) }
-  its(:error?) { is_expected.to be false }
+  it 'is version 13' do
+    expect(subject.version).to be 13
+  end
+
+  it 'has no errors' do
+    expect(subject.error?).to be false
+  end
 
-  it 'should raise error on invalid version' do
+  it 'raises error on invalid version' do
     subject = WebSocket::Frame::Incoming.new(version: 70)
     expect(subject.error?).to be true
-    expect(subject.error).to eql(:unknown_protocol_version)
+    expect(subject.error).to be :unknown_protocol_version
   end
 end

data/spec/handshake/client_04_spec.rb

@@ -9,13 +9,13 @@ RSpec.describe 'Client draft 4 handshake' do
 
   it_should_behave_like 'all client drafts'
 
-  it 'should disallow client with invalid challenge' do
+  it 'disallows client with invalid challenge' do
     @request_params = { accept: 'invalid' }
     handshake << server_response
 
     expect(handshake).to be_finished
     expect(handshake).not_to be_valid
-    expect(handshake.error).to eql(:invalid_handshake_authentication)
+    expect(handshake.error).to be(:invalid_handshake_authentication)
   end
 
   context 'protocol header specified' do
@@ -54,7 +54,7 @@ RSpec.describe 'Client draft 4 handshake' do
 
         expect(handshake).to be_finished
         expect(handshake).not_to be_valid
-        expect(handshake.error).to eql(:unsupported_protocol)
+        expect(handshake.error).to be(:unsupported_protocol)
       end
     end
   end

data/spec/handshake/client_11_spec.rb

@@ -9,12 +9,12 @@ RSpec.describe 'Client draft 11 handshake' do
 
   it_should_behave_like 'all client drafts'
 
-  it 'should disallow client with invalid challenge' do
+  it 'disallows client with invalid challenge' do
     @request_params = { accept: 'invalid' }
     handshake << server_response
 
     expect(handshake).to be_finished
     expect(handshake).not_to be_valid
-    expect(handshake.error).to eql(:invalid_handshake_authentication)
+    expect(handshake.error).to be(:invalid_handshake_authentication)
   end
 end

data/spec/handshake/client_75_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe 'Client draft 75 handshake' do
 
         expect(handshake).to be_finished
         expect(handshake).not_to be_valid
-        expect(handshake.error).to eql(:unsupported_protocol)
+        expect(handshake.error).to be(:unsupported_protocol)
       end
     end
   end

data/spec/handshake/client_76_spec.rb

@@ -9,13 +9,13 @@ RSpec.describe 'Client draft 76 handshake' do
 
   it_should_behave_like 'all client drafts'
 
-  it 'should disallow client with invalid challenge' do
+  it 'disallows client with invalid challenge' do
     @request_params = { challenge: 'invalid' }
     handshake << server_response
 
     expect(handshake).to be_finished
     expect(handshake).not_to be_valid
-    expect(handshake.error).to eql(:invalid_handshake_authentication)
+    expect(handshake.error).to be(:invalid_handshake_authentication)
   end
 
   context 'protocol header specified' do
@@ -38,7 +38,7 @@ RSpec.describe 'Client draft 76 handshake' do
 
         expect(handshake).to be_finished
         expect(handshake).not_to be_valid
-        expect(handshake.error).to eql(:unsupported_protocol)
+        expect(handshake.error).to be(:unsupported_protocol)
       end
     end
   end

data/spec/handshake/server_04_spec.rb

@@ -8,12 +8,12 @@ RSpec.describe 'Server draft 04 handshake' do
 
   it_should_behave_like 'all server drafts'
 
-  it 'should disallow request without Sec-WebSocket-Key' do
+  it 'disallows request without Sec-WebSocket-Key' do
     handshake << client_request.gsub(/^Sec-WebSocket-Key:.*\n/, '')
 
     expect(handshake).to be_finished
     expect(handshake).not_to be_valid
-    expect(handshake.error).to eql(:invalid_handshake_authentication)
+    expect(handshake.error).to be(:invalid_handshake_authentication)
   end
 
   context 'protocol header specified' do

data/spec/handshake/server_76_spec.rb

@@ -8,40 +8,40 @@ RSpec.describe 'Server draft 76 handshake' do
 
   it_should_behave_like 'all server drafts'
 
-  it 'should disallow request without spaces in key 1' do
+  it 'disallows request without spaces in key 1' do
     @request_params = { key1: '4@146546xW%0l15' }
     handshake << client_request
 
     expect(handshake).to be_finished
     expect(handshake).not_to be_valid
-    expect(handshake.error).to eql(:invalid_handshake_authentication)
+    expect(handshake.error).to be(:invalid_handshake_authentication)
   end
 
-  it 'should disallow request without spaces in key 2' do
+  it 'disallows request without spaces in key 2' do
     @request_params = { key2: '129985Y31.P00' }
     handshake << client_request
 
     expect(handshake).to be_finished
     expect(handshake).not_to be_valid
-    expect(handshake.error).to eql(:invalid_handshake_authentication)
+    expect(handshake.error).to be(:invalid_handshake_authentication)
   end
 
-  it 'should disallow request with invalid number of spaces or numbers in key 1' do
+  it 'disallows request with invalid number of spaces or numbers in key 1' do
     @request_params = { key1: '4 @1   46546xW%0l 1 5' }
     handshake << client_request
 
     expect(handshake).to be_finished
     expect(handshake).not_to be_valid
-    expect(handshake.error).to eql(:invalid_handshake_authentication)
+    expect(handshake.error).to be(:invalid_handshake_authentication)
   end
 
-  it 'should disallow request with invalid number of spaces or numbers in key 2' do
+  it 'disallows request with invalid number of spaces or numbers in key 2' do
     @request_params = { key2: '12998  5 Y3 1  .P00' }
     handshake << client_request
 
     expect(handshake).to be_finished
     expect(handshake).not_to be_valid
-    expect(handshake.error).to eql(:invalid_handshake_authentication)
+    expect(handshake.error).to be(:invalid_handshake_authentication)
   end
 
   context 'protocol header specified' do

data/spec/spec_helper.rb

@@ -1,6 +1,4 @@
 require 'rspec'
-require 'rspec/its'
-require 'webrick'
 
 require 'websocket'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/spec/support/all_client_drafts.rb

@@ -9,7 +9,7 @@ RSpec.shared_examples_for 'all client drafts' do
     expect(handshake).to be_valid
   end
 
-  it 'should be valid' do
+  it 'is valid' do
     handshake << server_response
 
     expect(handshake.error).to be_nil
@@ -17,92 +17,92 @@ RSpec.shared_examples_for 'all client drafts' do
     expect(handshake).to be_valid
   end
 
-  it 'should return valid version' do
+  it 'returns valid version' do
     expect(handshake.version).to eql(version)
   end
 
-  it 'should return valid host' do
+  it 'returns valid host' do
     @request_params = { host: 'www.test.cc' }
     expect(handshake.host).to eql('www.test.cc')
   end
 
-  it 'should return valid path' do
+  it 'returns valid path' do
     @request_params = { path: '/custom' }
     expect(handshake.path).to eql('/custom')
   end
 
-  it 'should return valid query' do
+  it 'returns valid query' do
     @request_params = { query: 'aaa=bbb' }
     expect(handshake.query).to eql('aaa=bbb')
   end
 
-  it 'should return valid port' do
+  it 'returns valid port' do
     @request_params = { port: 123 }
-    expect(handshake.port).to eql(123)
+    expect(handshake.port).to be(123)
   end
 
-  it 'should return valid headers' do
+  it 'returns valid headers' do
     @request_params = { headers: { 'aaa' => 'bbb' } }
     expect(handshake.headers).to eql('aaa' => 'bbb')
   end
 
-  it 'should parse uri' do
+  it 'parses uri' do
     @request_params = { uri: 'ws://test.example.org:301/test_path?query=true' }
     expect(handshake.host).to eql('test.example.org')
-    expect(handshake.port).to eql(301)
+    expect(handshake.port).to be(301)
     expect(handshake.path).to eql('/test_path')
     expect(handshake.query).to eql('query=true')
   end
 
-  it 'should parse url' do
+  it 'parses url' do
     @request_params = { url: 'ws://test.example.org:301/test_path?query=true' }
     expect(handshake.host).to eql('test.example.org')
-    expect(handshake.port).to eql(301)
+    expect(handshake.port).to be(301)
     expect(handshake.path).to eql('/test_path')
     expect(handshake.query).to eql('query=true')
   end
 
-  it 'should resolve correct path with root server provided' do
+  it 'resolves correct path with root server provided' do
     @request_params = { url: 'ws://test.example.org' }
     expect(handshake.path).to eql('/')
   end
 
-  it 'should return valid response' do
+  it 'returns valid response' do
     validate_request
   end
 
-  it 'should allow custom path' do
+  it 'allows custom path' do
     @request_params = { path: '/custom' }
     validate_request
   end
 
-  it 'should allow query in path' do
+  it 'allows query in path' do
     @request_params = { query: 'test=true' }
     validate_request
   end
 
-  it 'should allow custom port' do
+  it 'allows custom port' do
     @request_params = { port: 123 }
     validate_request
   end
 
-  it 'should allow custom headers' do
+  it 'allows custom headers' do
     @request_params = { headers: { 'aaa' => 'bbb' } }
     validate_request
   end
 
-  it 'should recognize unfinished requests' do
+  it 'recognizes unfinished requests' do
     handshake << server_response[0..-20]
 
     expect(handshake).not_to be_finished
     expect(handshake).not_to be_valid
   end
 
-  it 'should disallow requests with invalid request method' do
+  it 'disallows requests with invalid request method' do
     handshake << server_response.gsub('101', '404')
 
     expect(handshake).to be_finished
     expect(handshake).not_to be_valid
-    expect(handshake.error).to eql(:invalid_status_code)
+    expect(handshake.error).to be(:invalid_status_code)
   end
 end