rspec-expectations 2.12.1 → 2.13.0

data/spec/rspec/matchers/be_within_spec.rb

@@ -2,78 +2,127 @@ require 'spec_helper'
 
 module RSpec
   module Matchers
-    describe "[actual.should] be_within(delta).of(expected)" do
+    describe "expect(actual).to be_within(delta).of(expected)" do
       it_behaves_like "an RSpec matcher", :valid_value => 5, :invalid_value => -5 do
         let(:matcher) { be_within(2).of(4.0) }
       end
 
-      it "matches when actual == expected" do
-        be_within(0.5).of(5.0).matches?(5.0).should be_true
+      it "passes when actual == expected" do
+        expect(5.0).to be_within(0.5).of(5.0)
       end
 
-      it "matches when actual < (expected + delta)" do
-        be_within(0.5).of(5.0).matches?(5.49).should be_true
+      it "passes when actual < (expected + delta)" do
+        expect(5.49).to be_within(0.5).of(5.0)
       end
 
-      it "matches when actual > (expected - delta)" do
-        be_within(0.5).of(5.0).matches?(4.51).should be_true
+      it "passes when actual > (expected - delta)" do
+        expect(4.51).to be_within(0.5).of(5.0)
       end
 
-      it "matches when actual == (expected - delta)" do
-        be_within(0.5).of(5.0).matches?(4.5).should be_true
+      it "passes when actual == (expected - delta)" do
+        expect(4.5).to be_within(0.5).of(5.0)
       end
 
-      it "does not match when actual < (expected - delta)" do
-        be_within(0.5).of(5.0).matches?(4.49).should be_false
+      it "passes when actual == (expected + delta)" do
+        expect(5.5).to be_within(0.5).of(5.0)
       end
 
-      it "matches when actual == (expected + delta)" do
-        be_within(0.5).of(5.0).matches?(5.5).should be_true
+      it "fails when actual < (expected - delta)" do
+        expect {
+          expect(4.49).to be_within(0.5).of(5.0)
+        }.to fail_with("expected 4.49 to be within 0.5 of 5.0")
       end
 
-      it "does not match when actual > (expected + delta)" do
-        be_within(0.5).of(5.0).matches?(5.51).should be_false
-      end
-
-      it "provides a failure message for should" do
-        #given
-          matcher = be_within(0.5).of(5.0)
-        #when
-          matcher.matches?(5.51)
-        #then
-          matcher.failure_message_for_should.should == "expected 5.51 to be within 0.5 of 5.0"
-      end
-
-      it "provides a failure message for should not" do
-        #given
-          matcher = be_within(0.5).of(5.0)
-        #when
-          matcher.matches?(5.49)
-        #then
-          matcher.failure_message_for_should_not.should == "expected 5.49 not to be within 0.5 of 5.0"
+      it "fails when actual > (expected + delta)" do
+        expect {
+          expect(5.51).to be_within(0.5).of(5.0)
+        }.to fail_with("expected 5.51 to be within 0.5 of 5.0")
       end
 
       it "works with Time" do
-        Time.now.should be_within(0.1).of(Time.now)
+        expect(Time.now).to be_within(0.1).of(Time.now)
       end
 
       it "provides a description" do
         matcher = be_within(0.5).of(5.0)
         matcher.matches?(5.1)
-        matcher.description.should == "be within 0.5 of 5.0"
+        expect(matcher.description).to eq "be within 0.5 of 5.0"
       end
 
       it "raises an error if no expected value is given" do
-        matcher = be_within(0.5)
-        expect { matcher.matches?(5.1) }.to raise_error(
-          ArgumentError, /must set an expected value using #of/
-        )
+        expect {
+          expect(5.1).to be_within(0.5)
+        }.to raise_error(ArgumentError, /must set an expected value using #of/)
       end
 
       it "raises an error if the actual does not respond to :-" do
-        expect { be_within(0.1).of(0).matches?(nil) }.to raise_error(
-          ArgumentError, /The actual value \(nil\) must respond to `-`/
-        )
+        expect {
+          expect(nil).to be_within(0.1).of(0)
+        }.to raise_error(ArgumentError, /The actual value \(nil\) must respond to `-`/)
+      end
+    end
+
+    describe "expect(actual).to be_within(delta).percent_of(expected)" do
+      it "passes when actual is within the given percent variance" do
+        expect(9.0).to be_within(10).percent_of(10.0)
+        expect(10.0).to be_within(10).percent_of(10.0)
+        expect(11.0).to be_within(10).percent_of(10.0)
+      end
+
+      it "fails when actual is outside the given percent variance" do
+        expect {
+          expect(8.9).to be_within(10).percent_of(10.0)
+        }.to fail_with("expected 8.9 to be within 10% of 10.0")
+
+        expect {
+          expect(11.1).to be_within(10).percent_of(10.0)
+        }.to fail_with("expected 11.1 to be within 10% of 10.0")
+      end
+
+      it "provides a description" do
+        matcher = be_within(0.5).percent_of(5.0)
+        matcher.matches?(5.1)
+        expect(matcher.description).to eq "be within 0.5% of 5.0"
+      end
+    end
+
+    describe "expect(actual).not_to be_within(delta).of(expected)" do
+      it "passes when actual < (expected - delta)" do
+        expect(4.49).not_to be_within(0.5).of(5.0)
+      end
+
+      it "passes when actual > (expected + delta)" do
+        expect(5.51).not_to be_within(0.5).of(5.0)
+      end
+
+      it "fails when actual == expected" do
+        expect {
+          expect(5.0).not_to be_within(0.5).of(5.0)
+        }.to fail_with("expected 5.0 not to be within 0.5 of 5.0")
+      end
+
+      it "fails when actual < (expected + delta)" do
+        expect {
+          expect(5.49).not_to be_within(0.5).of(5.0)
+        }.to fail_with("expected 5.49 not to be within 0.5 of 5.0")
+      end
+
+      it "fails when actual > (expected - delta)" do
+        expect {
+          expect(4.51).not_to be_within(0.5).of(5.0)
+        }.to fail_with("expected 4.51 not to be within 0.5 of 5.0")
+      end
+
+      it "fails when actual == (expected - delta)" do
+        expect {
+          expect(4.5).not_to be_within(0.5).of(5.0)
+        }.to fail_with("expected 4.5 not to be within 0.5 of 5.0")
+      end
+
+      it "fails when actual == (expected + delta)" do
+        expect {
+          expect(5.5).not_to be_within(0.5).of(5.0)
+        }.to fail_with("expected 5.5 not to be within 0.5 of 5.0")
       end
     end
   end

data/spec/rspec/matchers/change_spec.rb

@@ -6,7 +6,7 @@ class SomethingExpected
   attr_accessor :some_value
 end
 
-describe "should change(actual, message)" do
+describe "expect { ... }.to change(actual, message)" do
   context "with a numeric value" do
     before(:each) do
       @instance = SomethingExpected.new
@@ -22,9 +22,9 @@ describe "should change(actual, message)" do
         expect {}.to change(@instance, :some_value)
       end.to fail_with("some_value should have changed, but is still 5")
     end
-    
+
     it "provides a #description" do
-      change(@instance, :some_value).description.should == "change #some_value"
+      expect(change(@instance, :some_value).description).to eq "change #some_value"
     end
   end
 
@@ -96,6 +96,20 @@ describe "should change(actual, message)" do
     end
   end
 
+  context "with a string" do
+    it "passes when actual is modified by the block" do
+      string = "ab"
+      expect { string << "c" }.to change { string }
+    end
+
+    it 'fails when actual is not modified by the block' do
+      string = "ab"
+      expect {
+        expect { }.to change { string }
+      }.to fail_with(/should have changed/)
+    end
+  end
+
   context "with an arbitrary enumerable" do
     before(:each) do
       @instance = SomethingExpected.new
@@ -135,7 +149,7 @@ describe "should change(actual, message)" do
   end
 end
 
-describe "should_not change(actual, message)" do
+describe "expect { ... }.not_to change(actual, message)" do
   before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 5
@@ -152,7 +166,7 @@ describe "should_not change(actual, message)" do
   end
 end
 
-describe "should change { block }" do
+describe "expect { ... }.to change { block }" do
   o = SomethingExpected.new
   it_behaves_like "an RSpec matcher", :valid_value => lambda { o.some_value = 5 },
                                       :invalid_value => lambda { } do
@@ -173,19 +187,19 @@ describe "should change { block }" do
       expect {}.to change{ @instance.some_value }
     end.to fail_with("result should have changed, but is still 5")
   end
-  
+
   it "warns if passed a block using do/end instead of {}" do
     expect do
       expect {}.to change do; end
     end.to raise_error(SyntaxError, /block passed to should or should_not/)
   end
-  
+
   it "provides a #description" do
-    change { @instance.some_value }.description.should == "change #result"
+    expect(change { @instance.some_value }.description).to eq "change #result"
   end
 end
 
-describe "should_not change { block }" do
+describe "expect { ... }.not_to change { block }" do
   before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 5
@@ -200,7 +214,7 @@ describe "should_not change { block }" do
       expect {@instance.some_value = 6}.to_not change { @instance.some_value }
     end.to fail_with("result should not have changed, but did change from 5 to 6")
   end
-  
+
   it "warns if passed a block using do/end instead of {}" do
     expect do
       expect {}.to_not change do; end
@@ -208,7 +222,7 @@ describe "should_not change { block }" do
   end
 end
 
-describe "should change(actual, message).by(expected)" do
+describe "expect { ... }.to change(actual, message).by(expected)" do
   before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 5
@@ -235,7 +249,7 @@ describe "should change(actual, message).by(expected)" do
   end
 end
 
-describe "should change{ block }.by(expected)" do
+describe "expect { ... }.to change { block }.by(expected)" do
   before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 5
@@ -258,7 +272,7 @@ describe "should change{ block }.by(expected)" do
   end
 end
 
-describe "should change(actual, message).by_at_least(expected)" do
+describe "expect { ... }.to change(actual, message).by_at_least(expected)" do
   before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 5
@@ -267,10 +281,10 @@ describe "should change(actual, message).by_at_least(expected)" do
   it "passes when attribute is changed by greater than the expected amount" do
     expect { @instance.some_value += 2 }.to change(@instance, :some_value).by_at_least(1)
   end
-  
+
   it "passes when attribute is changed by the expected amount" do
     expect { @instance.some_value += 2 }.to change(@instance, :some_value).by_at_least(2)
-  end  
+  end
 
   it "fails when the attribute is changed by less than the expected amount" do
     expect do
@@ -280,7 +294,7 @@ describe "should change(actual, message).by_at_least(expected)" do
 
 end
 
-describe "should change{ block }.by_at_least(expected)" do
+describe "expect { ... }.to change { block }.by_at_least(expected)" do
   before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 5
@@ -289,10 +303,10 @@ describe "should change{ block }.by_at_least(expected)" do
   it "passes when attribute is changed by greater than expected amount" do
     expect { @instance.some_value += 2 }.to change{@instance.some_value}.by_at_least(1)
   end
-  
+
   it "passes when attribute is changed by the expected amount" do
     expect { @instance.some_value += 2 }.to change{@instance.some_value}.by_at_least(2)
-  end  
+  end
 
   it "fails when the attribute is changed by less than the unexpected amount" do
     expect do
@@ -302,7 +316,7 @@ describe "should change{ block }.by_at_least(expected)" do
 end
 
 
-describe "should change(actual, message).by_at_most(expected)" do
+describe "expect { ... }.to change(actual, message).by_at_most(expected)" do
   before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 5
@@ -311,10 +325,10 @@ describe "should change(actual, message).by_at_most(expected)" do
   it "passes when attribute is changed by less than the expected amount" do
     expect { @instance.some_value += 2 }.to change(@instance, :some_value).by_at_most(3)
   end
-  
+
   it "passes when attribute is changed by the expected amount" do
     expect { @instance.some_value += 2 }.to change(@instance, :some_value).by_at_most(2)
-  end  
+  end
 
   it "fails when the attribute is changed by greater than the expected amount" do
     expect do
@@ -324,7 +338,7 @@ describe "should change(actual, message).by_at_most(expected)" do
 
 end
 
-describe "should change{ block }.by_at_most(expected)" do
+describe "expect { ... }.to change { block }.by_at_most(expected)" do
   before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 5
@@ -333,10 +347,10 @@ describe "should change{ block }.by_at_most(expected)" do
   it "passes when attribute is changed by less than expected amount" do
     expect { @instance.some_value += 2 }.to change{@instance.some_value}.by_at_most(3)
   end
-  
+
   it "passes when attribute is changed by the expected amount" do
     expect { @instance.some_value += 2 }.to change{@instance.some_value}.by_at_most(2)
-  end  
+  end
 
   it "fails when the attribute is changed by greater than the unexpected amount" do
     expect do
@@ -345,7 +359,7 @@ describe "should change{ block }.by_at_most(expected)" do
   end
 end
 
-describe "should change(actual, message).from(old)" do
+describe "expect { ... }.to change(actual, message).from(old)" do
   context "with boolean values" do
     before(:each) do
       @instance = SomethingExpected.new
@@ -386,7 +400,7 @@ describe "should change(actual, message).from(old)" do
   end
 end
 
-describe "should change{ block }.from(old)" do
+describe "expect { ... }.to change { block }.from(old)" do
   before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 'string'
@@ -409,13 +423,13 @@ describe "should change{ block }.from(old)" do
   end
 end
 
-describe "should change(actual, message).to(new)" do
+describe "expect { ... }.to change(actual, message).to(new)" do
   context "with boolean values" do
     before(:each) do
       @instance = SomethingExpected.new
       @instance.some_value = true
     end
-    
+
     it "passes when attribute is == to expected value after executing block" do
       expect { @instance.some_value = false }.to change(@instance, :some_value).to(false)
     end
@@ -431,7 +445,7 @@ describe "should change(actual, message).to(new)" do
       @instance = SomethingExpected.new
       @instance.some_value = 'string'
     end
-    
+
     it "passes when attribute is === to expected value after executing block" do
       expect { @instance.some_value = "cat" }.to change(@instance, :some_value).to("cat")
     end
@@ -450,12 +464,12 @@ describe "should change(actual, message).to(new)" do
   end
 end
 
-describe "should change{ block }.to(new)" do
+describe "expect { ... }.to change { block }.to(new)" do
   before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 'string'
   end
-  
+
   it "passes when attribute is === to expected value after executing block" do
     expect { @instance.some_value = "cat" }.to change{@instance.some_value}.to("cat")
   end
@@ -473,12 +487,12 @@ describe "should change{ block }.to(new)" do
   end
 end
 
-describe "should change(actual, message).from(old).to(new)" do
+describe "expect { ... }.to change(actual, message).from(old).to(new)" do
   before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 'string'
   end
-  
+
   it "passes when #to comes before #from" do
     expect { @instance.some_value = "cat" }.to change(@instance, :some_value).to("cat").from("string")
   end
@@ -486,13 +500,13 @@ describe "should change(actual, message).from(old).to(new)" do
   it "passes when #from comes before #to" do
     expect { @instance.some_value = "cat" }.to change(@instance, :some_value).from("string").to("cat")
   end
-  
+
   it "shows the correct messaging when #after and #to are different" do
     expect do
       expect { @instance.some_value = "cat" }.to change(@instance, :some_value).from("string").to("dog")
     end.to fail_with("some_value should have been changed to \"dog\", but is now \"cat\"")
   end
-  
+
   it "shows the correct messaging when #before and #from are different" do
     expect do
       expect { @instance.some_value = "cat" }.to change(@instance, :some_value).from("not_string").to("cat")
@@ -500,12 +514,12 @@ describe "should change(actual, message).from(old).to(new)" do
   end
 end
 
-describe "should change{ block }.from(old).to(new)" do
+describe "expect { ... }.to change { block }.from(old).to(new)" do
   before(:each) do
     @instance = SomethingExpected.new
     @instance.some_value = 'string'
   end
-  
+
   it "passes when #to comes before #from" do
     expect { @instance.some_value = "cat" }.to change{@instance.some_value}.to("cat").from("string")
   end
@@ -520,7 +534,7 @@ describe RSpec::Matchers::BuiltIn::Change do
     @instance = SomethingExpected.new
     @instance.some_value = "string"
     def @instance.send(*args); raise "DOH! Library developers shouldn't use #send!" end
-    
+
     expect {
       expect { @instance.some_value = "cat" }.to change(@instance, :some_value)
     }.to_not raise_error