THRIFT-4342: update ruby tests to use rspec 3, updated all dependencies for ruby
Client: rb
diff --git a/lib/rb/spec/ssl_socket_spec.rb b/lib/rb/spec/ssl_socket_spec.rb
index 9ee946b..808d8d5 100644
--- a/lib/rb/spec/ssl_socket_spec.rb
+++ b/lib/rb/spec/ssl_socket_spec.rb
@@ -26,53 +26,53 @@
before(:each) do
@context = OpenSSL::SSL::SSLContext.new
@socket = Thrift::SSLSocket.new
- @simple_socket_handle = mock("Handle", :closed? => false)
- @simple_socket_handle.stub!(:close)
- @simple_socket_handle.stub!(:connect_nonblock)
- @simple_socket_handle.stub!(:setsockopt)
+ @simple_socket_handle = double("Handle", :closed? => false)
+ allow(@simple_socket_handle).to receive(:close)
+ allow(@simple_socket_handle).to receive(:connect_nonblock)
+ allow(@simple_socket_handle).to receive(:setsockopt)
- @handle = mock(mock("SSLHandle", :connect_nonblock => true, :post_connection_check => true), :closed? => false)
- @handle.stub!(:connect_nonblock)
- @handle.stub!(:close)
- @handle.stub!(:post_connection_check)
+ @handle = double(double("SSLHandle", :connect_nonblock => true, :post_connection_check => true), :closed? => false)
+ allow(@handle).to receive(:connect_nonblock)
+ allow(@handle).to receive(:close)
+ allow(@handle).to receive(:post_connection_check)
- ::Socket.stub!(:new).and_return(@simple_socket_handle)
- OpenSSL::SSL::SSLSocket.stub!(:new).and_return(@handle)
+ allow(::Socket).to receive(:new).and_return(@simple_socket_handle)
+ allow(OpenSSL::SSL::SSLSocket).to receive(:new).and_return(@handle)
end
it_should_behave_like "a socket"
it "should raise a TransportException when it cannot open a ssl socket" do
- ::Socket.should_receive(:getaddrinfo).with("localhost", 9090, nil, ::Socket::SOCK_STREAM).and_return([[]])
- lambda { @socket.open }.should raise_error(Thrift::TransportException) { |e| e.type.should == Thrift::TransportException::NOT_OPEN }
+ expect(::Socket).to receive(:getaddrinfo).with("localhost", 9090, nil, ::Socket::SOCK_STREAM).and_return([[]])
+ expect { @socket.open }.to raise_error(Thrift::TransportException) { |e| expect(e.type).to eq(Thrift::TransportException::NOT_OPEN) }
end
it "should open a ::Socket with default args" do
- OpenSSL::SSL::SSLSocket.should_receive(:new).with(@simple_socket_handle, nil).and_return(@handle)
- @handle.should_receive(:post_connection_check).with('localhost')
+ expect(OpenSSL::SSL::SSLSocket).to receive(:new).with(@simple_socket_handle, nil).and_return(@handle)
+ expect(@handle).to receive(:post_connection_check).with('localhost')
@socket.open
end
it "should accept host/port options" do
- handle = mock("Handle", :connect_nonblock => true, :setsockopt => nil)
- ::Socket.stub!(:new).and_return(handle)
- ::Socket.should_receive(:getaddrinfo).with("my.domain", 1234, nil, ::Socket::SOCK_STREAM).and_return([[]])
- ::Socket.should_receive(:sockaddr_in)
- OpenSSL::SSL::SSLSocket.should_receive(:new).with(handle, nil).and_return(@handle)
- @handle.should_receive(:post_connection_check).with('my.domain')
+ handle = double("Handle", :connect_nonblock => true, :setsockopt => nil)
+ allow(::Socket).to receive(:new).and_return(handle)
+ expect(::Socket).to receive(:getaddrinfo).with("my.domain", 1234, nil, ::Socket::SOCK_STREAM).and_return([[]])
+ expect(::Socket).to receive(:sockaddr_in)
+ expect(OpenSSL::SSL::SSLSocket).to receive(:new).with(handle, nil).and_return(@handle)
+ expect(@handle).to receive(:post_connection_check).with('my.domain')
Thrift::SSLSocket.new('my.domain', 1234, 6000, nil).open
end
it "should accept an optional timeout" do
- Thrift::SSLSocket.new('localhost', 8080, 5).timeout.should == 5
+ expect(Thrift::SSLSocket.new('localhost', 8080, 5).timeout).to eq(5)
end
it "should accept an optional context" do
- Thrift::SSLSocket.new('localhost', 8080, 5, @context).ssl_context.should == @context
+ expect(Thrift::SSLSocket.new('localhost', 8080, 5, @context).ssl_context).to eq(@context)
end
it "should provide a reasonable to_s" do
- Thrift::SSLSocket.new('myhost', 8090).to_s.should == "ssl(socket(myhost:8090))"
+ expect(Thrift::SSLSocket.new('myhost', 8090).to_s).to eq("ssl(socket(myhost:8090))")
end
end
end