Skip to content

Commit

Permalink
use expect ... to instead of lambda ... should in rspec
Browse files Browse the repository at this point in the history
  • Loading branch information
flyerhzm committed Nov 10, 2012
1 parent 6b4bcc4 commit 16b6f6f
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions spec/memcached_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
end

it "should raise error with unsupported option hash" do
lambda { Memcached.new("127.0.0.1:11211", :hash => :unknown) }.should raise_error(Memcached::NotSupport)
expect { Memcached.new("127.0.0.1:11211", :hash => :unknown) }.to raise_error(Memcached::NotSupport)
end

it "should raise error with unsupported option distribution" do
lambda { Memcached.new("127.0.0.1:11211", :distribution => :unknown) }.should raise_error(Memcached::NotSupport)
expect { Memcached.new("127.0.0.1:11211", :distribution => :unknown) }.to raise_error(Memcached::NotSupport)
end

it "should ignore nil value" do
lambda { Memcached.new("127.0.0.1:11211", :prefix => nil) }.should_not raise_error
expect { Memcached.new("127.0.0.1:11211", :prefix => nil) }.not_to raise_error
end
end

Expand All @@ -51,7 +51,7 @@

it "should get missing" do
@memcached.delete "key" rescue nil
lambda { @memcached.get "key" }.should raise_error(Memcached::NotFound)
expect { @memcached.get "key" }.to raise_error(Memcached::NotFound)
end

context "multiget" do
Expand All @@ -78,7 +78,7 @@
@memcached.set "key", "value", 1
@memcached.get("key").should == "value"
sleep 1
lambda { @memcached.get("key") }.should raise_error(Memcached::NotFound)
expect { @memcached.get("key") }.to raise_error(Memcached::NotFound)
end
end

Expand All @@ -91,15 +91,15 @@

it "should not add existing key" do
@memcached.set "key", "value"
lambda { @memcached.add "key", "value" }.should raise_error(Memcached::NotStored)
expect { @memcached.add "key", "value" }.to raise_error(Memcached::NotStored)
end

it "should add expiry" do
@memcached.delete "key" rescue nil
@memcached.add "key", "value", 1
@memcached.get "key"
sleep 1
lambda { @memcached.get "key" }.should raise_error(Memcached::NotFound)
expect { @memcached.get "key" }.to raise_error(Memcached::NotFound)
end
end

Expand All @@ -112,21 +112,21 @@

it "should not replace with new key" do
@memcached.delete "key" rescue nil
lambda { @memcached.replace "key", "value" }.should raise_error(Memcached::NotStored)
lambda { @memcached.get "key" }.should raise_error(Memcached::NotFound)
expect { @memcached.replace "key", "value" }.to raise_error(Memcached::NotStored)
expect { @memcached.get "key" }.to raise_error(Memcached::NotFound)
end
end

context "delete" do
it "should delete with existing key" do
@memcached.set "key", "value"
@memcached.delete "key"
lambda { @memcached.get "key" }.should raise_error(Memcached::NotFound)
expect { @memcached.get "key" }.to raise_error(Memcached::NotFound)
end

it "should not delete with new key" do
@memcached.delete "key" rescue nil
lambda { @memcached.delete "key" }.should raise_error(Memcached::NotFound)
expect { @memcached.delete "key" }.to raise_error(Memcached::NotFound)
end
end

Expand Down Expand Up @@ -180,8 +180,8 @@
@memcached.set "key1", "value2"
@memcached.set "key2", "value2"
@memcached.flush
lambda { @memcached.get "key1" }.should raise_error(Memcached::NotFound)
lambda { @memcached.get "key2" }.should raise_error(Memcached::NotFound)
expect { @memcached.get "key1" }.to raise_error(Memcached::NotFound)
expect { @memcached.get "key2" }.to raise_error(Memcached::NotFound)
end
end

Expand Down Expand Up @@ -213,7 +213,7 @@
it "should delete with prefix_key" do
@prefix_memcached.set "key", "value"
@prefix_memcached.delete "key"
lambda { @memcached.get("jrubykey") }.should raise_error(Memcached::NotFound)
expect { @memcached.get("jrubykey") }.to raise_error(Memcached::NotFound)
end

it "should multiget with prefix_key" do
Expand Down

0 comments on commit 16b6f6f

Please sign in to comment.