THRIFT-4342: update ruby tests to use rspec 3, updated all dependencies for ruby
Client: rb
diff --git a/lib/rb/spec/socket_spec_shared.rb b/lib/rb/spec/socket_spec_shared.rb
index 5fddc16..32bdb71 100644
--- a/lib/rb/spec/socket_spec_shared.rb
+++ b/lib/rb/spec/socket_spec_shared.rb
@@ -21,84 +21,84 @@
shared_examples_for "a socket" do
it "should open a socket" do
- @socket.open.should == @handle
+ expect(@socket.open).to eq(@handle)
end
it "should be open whenever it has a handle" do
- @socket.should_not be_open
+ expect(@socket).not_to be_open
@socket.open
- @socket.should be_open
+ expect(@socket).to be_open
@socket.handle = nil
- @socket.should_not be_open
+ expect(@socket).not_to be_open
@socket.handle = @handle
@socket.close
- @socket.should_not be_open
+ expect(@socket).not_to be_open
end
it "should write data to the handle" do
@socket.open
- @handle.should_receive(:write).with("foobar")
+ expect(@handle).to receive(:write).with("foobar")
@socket.write("foobar")
- @handle.should_receive(:write).with("fail").and_raise(StandardError)
- lambda { @socket.write("fail") }.should raise_error(Thrift::TransportException) { |e| e.type.should == Thrift::TransportException::NOT_OPEN }
+ expect(@handle).to receive(:write).with("fail").and_raise(StandardError)
+ expect { @socket.write("fail") }.to raise_error(Thrift::TransportException) { |e| expect(e.type).to eq(Thrift::TransportException::NOT_OPEN) }
end
it "should raise an error when it cannot read from the handle" do
@socket.open
- @handle.should_receive(:readpartial).with(17).and_raise(StandardError)
- lambda { @socket.read(17) }.should raise_error(Thrift::TransportException) { |e| e.type.should == Thrift::TransportException::NOT_OPEN }
+ expect(@handle).to receive(:readpartial).with(17).and_raise(StandardError)
+ expect { @socket.read(17) }.to raise_error(Thrift::TransportException) { |e| expect(e.type).to eq(Thrift::TransportException::NOT_OPEN) }
end
it "should return the data read when reading from the handle works" do
@socket.open
- @handle.should_receive(:readpartial).with(17).and_return("test data")
- @socket.read(17).should == "test data"
+ expect(@handle).to receive(:readpartial).with(17).and_return("test data")
+ expect(@socket.read(17)).to eq("test data")
end
it "should declare itself as closed when it has an error" do
@socket.open
- @handle.should_receive(:write).with("fail").and_raise(StandardError)
- @socket.should be_open
- lambda { @socket.write("fail") }.should raise_error
- @socket.should_not be_open
+ expect(@handle).to receive(:write).with("fail").and_raise(StandardError)
+ expect(@socket).to be_open
+ expect { @socket.write("fail") }.to raise_error(Thrift::TransportException) { |e| expect(e.type).to eq(Thrift::TransportException::NOT_OPEN) }
+ expect(@socket).not_to be_open
end
it "should raise an error when the stream is closed" do
@socket.open
- @handle.stub!(:closed?).and_return(true)
- @socket.should_not be_open
- lambda { @socket.write("fail") }.should raise_error(IOError, "closed stream")
- lambda { @socket.read(10) }.should raise_error(IOError, "closed stream")
+ allow(@handle).to receive(:closed?).and_return(true)
+ expect(@socket).not_to be_open
+ expect { @socket.write("fail") }.to raise_error(IOError, "closed stream")
+ expect { @socket.read(10) }.to raise_error(IOError, "closed stream")
end
it "should support the timeout accessor for read" do
@socket.timeout = 3
@socket.open
- IO.should_receive(:select).with([@handle], nil, nil, 3).and_return([[@handle], [], []])
- @handle.should_receive(:readpartial).with(17).and_return("test data")
- @socket.read(17).should == "test data"
+ expect(IO).to receive(:select).with([@handle], nil, nil, 3).and_return([[@handle], [], []])
+ expect(@handle).to receive(:readpartial).with(17).and_return("test data")
+ expect(@socket.read(17)).to eq("test data")
end
it "should support the timeout accessor for write" do
@socket.timeout = 3
@socket.open
- IO.should_receive(:select).with(nil, [@handle], nil, 3).twice.and_return([[], [@handle], []])
- @handle.should_receive(:write_nonblock).with("test data").and_return(4)
- @handle.should_receive(:write_nonblock).with(" data").and_return(5)
- @socket.write("test data").should == 9
+ expect(IO).to receive(:select).with(nil, [@handle], nil, 3).twice.and_return([[], [@handle], []])
+ expect(@handle).to receive(:write_nonblock).with("test data").and_return(4)
+ expect(@handle).to receive(:write_nonblock).with(" data").and_return(5)
+ expect(@socket.write("test data")).to eq(9)
end
it "should raise an error when read times out" do
@socket.timeout = 0.5
@socket.open
- IO.should_receive(:select).once {sleep(0.5); nil}
- lambda { @socket.read(17) }.should raise_error(Thrift::TransportException) { |e| e.type.should == Thrift::TransportException::TIMED_OUT }
+ expect(IO).to receive(:select).once {sleep(0.5); nil}
+ expect { @socket.read(17) }.to raise_error(Thrift::TransportException) { |e| expect(e.type).to eq(Thrift::TransportException::TIMED_OUT) }
end
it "should raise an error when write times out" do
@socket.timeout = 0.5
@socket.open
- IO.should_receive(:select).with(nil, [@handle], nil, 0.5).any_number_of_times.and_return(nil)
- lambda { @socket.write("test data") }.should raise_error(Thrift::TransportException) { |e| e.type.should == Thrift::TransportException::TIMED_OUT }
+ allow(IO).to receive(:select).with(nil, [@handle], nil, 0.5).and_return(nil)
+ expect { @socket.write("test data") }.to raise_error(Thrift::TransportException) { |e| expect(e.type).to eq(Thrift::TransportException::TIMED_OUT) }
end
end