spec/wait_for_spec.rb in cistern-0.6.0 vs spec/wait_for_spec.rb in cistern-0.7.0

- old
+ new

@@ -24,26 +24,26 @@ end end describe 'Cistern#wait_for' do it "should return false if timeout exceeded" do - Cistern.wait_for(0, 0) { false }.should be_false + expect(Cistern.wait_for(0, 0) { false }).to be_false end end describe 'Cistern#wait_for!' do it "should raise if timeout exceeded" do - lambda { Cistern.wait_for!(0, 0) { false } }.should raise_exception(Cistern::Timeout) + expect { Cistern.wait_for!(0, 0) { false } }.to raise_exception(Cistern::Timeout) end end describe 'Cistern::Model#wait_for!' do let(:service) { WaitForService.new } let(:model) { service.wait_for_models.new(identity: 1) } it "should raise if timeout exceeded" do - lambda { model.wait_for!(0, 0) { false } }.should raise_exception(WaitForService::Timeout) + expect { model.wait_for!(0, 0) { false } }.to raise_exception(WaitForService::Timeout) end end describe "WaitForModel#timeout" do @@ -55,24 +55,24 @@ service.class.poll_interval = 0 elapsed = 0 timeout(2) do - lambda do + expect do model.wait_for! { sleep(0.2); elapsed += 0.2; elapsed > 0.2 } - end.should raise_exception(WaitForService::Timeout) + end.to raise_exception(WaitForService::Timeout) end end it "should favor explicit timeout" do service.class.timeout = 1 service.class.poll_interval = 0 elapsed = 0 timeout(2) do - lambda do + expect do model.wait_for!(0.1) { sleep(0.2); elapsed += 0.2; elapsed > 0.2 } - end.should raise_exception(WaitForService::Timeout) + end.to raise_exception(WaitForService::Timeout) end end end