rspec-expectations 2.12.1 → 2.13.0

data/spec/rspec/matchers/respond_to_spec.rb

@@ -1,295 +1,292 @@
 require 'spec_helper'
 
-describe "should respond_to(:sym)" do
+describe "expect(...).to respond_to(:sym)" do
   it_behaves_like "an RSpec matcher", :valid_value => "s", :invalid_value => 5 do
     let(:matcher) { respond_to(:upcase) }
   end
-  
+
   it "passes if target responds to :sym" do
-    Object.new.should respond_to(:methods)
+    expect(Object.new).to respond_to(:methods)
   end
-  
+
   it "fails if target does not respond to :sym" do
-    lambda {
-      "this string".should respond_to(:some_method)
-    }.should fail_with(%q|expected "this string" to respond to :some_method|)
+    expect {
+      expect("this string").to respond_to(:some_method)
+    }.to fail_with(%q|expected "this string" to respond to :some_method|)
   end
-  
 end
 
-describe "should respond_to(:sym).with(1).argument" do
+describe "expect(...).to respond_to(:sym).with(1).argument" do
   it "passes if target responds to :sym with 1 arg" do
     obj = Object.new
     def obj.foo(arg); end
-    obj.should respond_to(:foo).with(1).argument
+    expect(obj).to respond_to(:foo).with(1).argument
   end
 
   it "passes if target responds to any number of arguments" do
     obj = Object.new
     def obj.foo(*args); end
-    obj.should respond_to(:foo).with(1).argument
+    expect(obj).to respond_to(:foo).with(1).argument
   end
 
   it "passes if target responds to one or more arguments" do
     obj = Object.new
     def obj.foo(a, *args); end
-    obj.should respond_to(:foo).with(1).argument
+    expect(obj).to respond_to(:foo).with(1).argument
   end
-  
+
   it "fails if target does not respond to :sym" do
     obj = Object.new
-    lambda {
-      obj.should respond_to(:some_method).with(1).argument
-    }.should fail_with(/expected .* to respond to :some_method/)
+    expect {
+      expect(obj).to respond_to(:some_method).with(1).argument
+    }.to fail_with(/expected .* to respond to :some_method/)
   end
-  
+
   it "fails if :sym expects 0 args" do
     obj = Object.new
     def obj.foo; end
-    lambda {
-      obj.should respond_to(:foo).with(1).argument
-    }.should fail_with(/expected #<Object.*> to respond to :foo with 1 argument/)
+    expect {
+      expect(obj).to respond_to(:foo).with(1).argument
+    }.to fail_with(/expected #<Object.*> to respond to :foo with 1 argument/)
   end
-  
+
   it "fails if :sym expects 2 args" do
     obj = Object.new
     def obj.foo(arg, arg2); end
-    lambda {
-      obj.should respond_to(:foo).with(1).argument
-    }.should fail_with(/expected #<Object.*> to respond to :foo with 1 argument/)
+    expect {
+      expect(obj).to respond_to(:foo).with(1).argument
+    }.to fail_with(/expected #<Object.*> to respond to :foo with 1 argument/)
   end
 
   it "fails if :sym expects 2 or more args" do
     obj = Object.new
     def obj.foo(arg, arg2, *args); end
-    lambda {
-      obj.should respond_to(:foo).with(1).argument
-    }.should fail_with(/expected #<Object.*> to respond to :foo with 1 argument/)
+    expect {
+      expect(obj).to respond_to(:foo).with(1).argument
+    }.to fail_with(/expected #<Object.*> to respond to :foo with 1 argument/)
   end
 end
 
-describe "should respond_to(message1, message2)" do
-  
+describe "expect(...).to respond_to(message1, message2)" do
   it "passes if target responds to both messages" do
-    Object.new.should respond_to('methods', 'inspect')
+    expect(Object.new).to respond_to('methods', 'inspect')
   end
-  
+
   it "fails if target does not respond to first message" do
-    lambda {
-      Object.new.should respond_to('method_one', 'inspect')
-    }.should fail_with(/expected #<Object:.*> to respond to "method_one"/)
+    expect {
+      expect(Object.new).to respond_to('method_one', 'inspect')
+    }.to fail_with(/expected #<Object:.*> to respond to "method_one"/)
   end
-  
+
   it "fails if target does not respond to second message" do
-    lambda {
-      Object.new.should respond_to('inspect', 'method_one')
-    }.should fail_with(/expected #<Object:.*> to respond to "method_one"/)
+    expect {
+      expect(Object.new).to respond_to('inspect', 'method_one')
+    }.to fail_with(/expected #<Object:.*> to respond to "method_one"/)
   end
-  
+
   it "fails if target does not respond to either message" do
-    lambda {
-      Object.new.should respond_to('method_one', 'method_two')
-    }.should fail_with(/expected #<Object:.*> to respond to "method_one", "method_two"/)
+    expect {
+      expect(Object.new).to respond_to('method_one', 'method_two')
+    }.to fail_with(/expected #<Object:.*> to respond to "method_one", "method_two"/)
   end
 end
 
-describe "should respond_to(:sym).with(2).arguments" do
+describe "expect(...).to respond_to(:sym).with(2).arguments" do
   it "passes if target responds to :sym with 2 args" do
     obj = Object.new
     def obj.foo(a1, a2); end
-    obj.should respond_to(:foo).with(2).arguments
+    expect(obj).to respond_to(:foo).with(2).arguments
   end
 
   it "passes if target responds to any number of arguments" do
     obj = Object.new
     def obj.foo(*args); end
-    obj.should respond_to(:foo).with(2).arguments
+    expect(obj).to respond_to(:foo).with(2).arguments
   end
 
   it "passes if target responds to one or more arguments" do
     obj = Object.new
     def obj.foo(a, *args); end
-    obj.should respond_to(:foo).with(2).arguments
+    expect(obj).to respond_to(:foo).with(2).arguments
   end
 
   it "passes if target responds to two or more arguments" do
     obj = Object.new
     def obj.foo(a, b, *args); end
-    obj.should respond_to(:foo).with(2).arguments
+    expect(obj).to respond_to(:foo).with(2).arguments
   end
-  
+
   it "fails if target does not respond to :sym" do
     obj = Object.new
-    lambda {
-      obj.should respond_to(:some_method).with(2).arguments
-    }.should fail_with(/expected .* to respond to :some_method/)
+    expect {
+      expect(obj).to respond_to(:some_method).with(2).arguments
+    }.to fail_with(/expected .* to respond to :some_method/)
   end
-  
+
   it "fails if :sym expects 0 args" do
     obj = Object.new
     def obj.foo; end
-    lambda {
-      obj.should respond_to(:foo).with(2).arguments
-    }.should fail_with(/expected #<Object.*> to respond to :foo with 2 arguments/)
+    expect {
+      expect(obj).to respond_to(:foo).with(2).arguments
+    }.to fail_with(/expected #<Object.*> to respond to :foo with 2 arguments/)
   end
-  
+
   it "fails if :sym expects 1 args" do
     obj = Object.new
     def obj.foo(arg); end
-    lambda {
-      obj.should respond_to(:foo).with(2).arguments
-    }.should fail_with(/expected #<Object.*> to respond to :foo with 2 arguments/)
+    expect {
+      expect(obj).to respond_to(:foo).with(2).arguments
+    }.to fail_with(/expected #<Object.*> to respond to :foo with 2 arguments/)
   end
 
   it "fails if :sym expects 3 or more args" do
     obj = Object.new
     def obj.foo(arg, arg2, arg3, *args); end
-    lambda {
-      obj.should respond_to(:foo).with(2).arguments
-    }.should fail_with(/expected #<Object.*> to respond to :foo with 2 arguments/)
+    expect {
+      expect(obj).to respond_to(:foo).with(2).arguments
+    }.to fail_with(/expected #<Object.*> to respond to :foo with 2 arguments/)
   end
 end
 
-describe "should_not respond_to(:sym)" do
-  
+describe "expect(...).to_not respond_to(:sym)" do
   it "passes if target does not respond to :sym" do
-    Object.new.should_not respond_to(:some_method)
+    expect(Object.new).not_to respond_to(:some_method)
   end
-  
+
   it "fails if target responds to :sym" do
-    lambda {
-      Object.new.should_not respond_to(:methods)
-    }.should fail_with(/expected #<Object:.*> not to respond to :methods/)
+    expect {
+      expect(Object.new).not_to respond_to(:methods)
+    }.to fail_with(/expected #<Object:.*> not to respond to :methods/)
   end
-  
 end
 
-describe "should_not respond_to(:sym).with(1).argument" do
+describe "expect(...).to_not respond_to(:sym).with(1).argument" do
   it "fails if target responds to :sym with 1 arg" do
     obj = Object.new
     def obj.foo(arg); end
-    lambda {
-      obj.should_not respond_to(:foo).with(1).argument
-    }.should fail_with(/expected #<Object:.*> not to respond to :foo with 1 argument/)
+    expect {
+      expect(obj).not_to respond_to(:foo).with(1).argument
+    }.to fail_with(/expected #<Object:.*> not to respond to :foo with 1 argument/)
   end
 
   it "fails if target responds to :sym with any number of args" do
     obj = Object.new
     def obj.foo(*args); end
-    lambda {
-      obj.should_not respond_to(:foo).with(1).argument
-    }.should fail_with(/expected #<Object:.*> not to respond to :foo with 1 argument/)
+    expect {
+      expect(obj).not_to respond_to(:foo).with(1).argument
+    }.to fail_with(/expected #<Object:.*> not to respond to :foo with 1 argument/)
   end
 
   it "fails if target responds to :sym with one or more args" do
     obj = Object.new
     def obj.foo(a, *args); end
-    lambda {
-      obj.should_not respond_to(:foo).with(1).argument
-    }.should fail_with(/expected #<Object:.*> not to respond to :foo with 1 argument/)
+    expect {
+      expect(obj).not_to respond_to(:foo).with(1).argument
+    }.to fail_with(/expected #<Object:.*> not to respond to :foo with 1 argument/)
   end
 
   it "passes if target does not respond to :sym" do
     obj = Object.new
-    obj.should_not respond_to(:some_method).with(1).argument
+    expect(obj).not_to respond_to(:some_method).with(1).argument
   end
 
   it "passes if :sym expects 0 args" do
     obj = Object.new
     def obj.foo; end
-    obj.should_not respond_to(:foo).with(1).argument
+    expect(obj).not_to respond_to(:foo).with(1).argument
   end
 
   it "passes if :sym expects 2 args" do
     obj = Object.new
     def obj.foo(arg, arg2); end
-    obj.should_not respond_to(:foo).with(1).argument
+    expect(obj).not_to respond_to(:foo).with(1).argument
   end
 
   it "passes if :sym expects 2 or more args" do
     obj = Object.new
     def obj.foo(arg, arg2, *args); end
-    obj.should_not respond_to(:foo).with(1).argument
+    expect(obj).not_to respond_to(:foo).with(1).argument
   end
 end
 
-describe "should_not respond_to(message1, message2)" do
+describe "expect(...).to_not respond_to(message1, message2)" do
   it "passes if target does not respond to either message1 or message2" do
-    Object.new.should_not respond_to(:some_method, :some_other_method)
+    expect(Object.new).not_to respond_to(:some_method, :some_other_method)
   end
 
   it "fails if target responds to message1 but not message2" do
-    lambda {
-      Object.new.should_not respond_to(:object_id, :some_method)
-    }.should fail_with(/expected #<Object:.*> not to respond to :object_id/)
+    expect {
+      expect(Object.new).not_to respond_to(:object_id, :some_method)
+    }.to fail_with(/expected #<Object:.*> not to respond to :object_id/)
   end
 
   it "fails if target responds to message2 but not message1" do
-    lambda {
-      Object.new.should_not respond_to(:some_method, :object_id)
-    }.should fail_with(/expected #<Object:.*> not to respond to :object_id/)
+    expect {
+      expect(Object.new).not_to respond_to(:some_method, :object_id)
+    }.to fail_with(/expected #<Object:.*> not to respond to :object_id/)
   end
 
   it "fails if target responds to both message1 and message2" do
-    lambda {
-      Object.new.should_not respond_to(:class, :object_id)
-    }.should fail_with(/expected #<Object:.*> not to respond to :class, :object_id/)
+    expect {
+      expect(Object.new).not_to respond_to(:class, :object_id)
+    }.to fail_with(/expected #<Object:.*> not to respond to :class, :object_id/)
   end
 end
 
-describe "should_not respond_to(:sym).with(2).arguments" do
+describe "expect(...).to_not respond_to(:sym).with(2).arguments" do
   it "fails if target responds to :sym with 2 args" do
     obj = Object.new
     def obj.foo(a1, a2); end
-    lambda {
-      obj.should_not respond_to(:foo).with(2).arguments
-    }.should fail_with(/expected .* not to respond to :foo with 2 arguments/)
+    expect {
+      expect(obj).not_to respond_to(:foo).with(2).arguments
+    }.to fail_with(/expected .* not to respond to :foo with 2 arguments/)
   end
 
   it "fails if target responds to :sym with any number args" do
     obj = Object.new
     def obj.foo(*args); end
-    lambda {
-      obj.should_not respond_to(:foo).with(2).arguments
-    }.should fail_with(/expected .* not to respond to :foo with 2 arguments/)
+    expect {
+      expect(obj).not_to respond_to(:foo).with(2).arguments
+    }.to fail_with(/expected .* not to respond to :foo with 2 arguments/)
   end
 
   it "fails if target responds to :sym with one or more args" do
     obj = Object.new
     def obj.foo(a, *args); end
-    lambda {
-      obj.should_not respond_to(:foo).with(2).arguments
-    }.should fail_with(/expected .* not to respond to :foo with 2 arguments/)
+    expect {
+      expect(obj).not_to respond_to(:foo).with(2).arguments
+    }.to fail_with(/expected .* not to respond to :foo with 2 arguments/)
   end
 
   it "fails if target responds to :sym with two or more args" do
     obj = Object.new
     def obj.foo(a, b, *args); end
-    lambda {
-      obj.should_not respond_to(:foo).with(2).arguments
-    }.should fail_with(/expected .* not to respond to :foo with 2 arguments/)
+    expect {
+      expect(obj).not_to respond_to(:foo).with(2).arguments
+    }.to fail_with(/expected .* not to respond to :foo with 2 arguments/)
   end
 
   it "passes if target does not respond to :sym" do
     obj = Object.new
-    obj.should_not respond_to(:some_method).with(2).arguments
+    expect(obj).not_to respond_to(:some_method).with(2).arguments
   end
 
   it "passes if :sym expects 0 args" do
     obj = Object.new
     def obj.foo; end
-    obj.should_not respond_to(:foo).with(2).arguments
+    expect(obj).not_to respond_to(:foo).with(2).arguments
   end
 
   it "passes if :sym expects 2 args" do
     obj = Object.new
     def obj.foo(arg); end
-    obj.should_not respond_to(:foo).with(2).arguments
+    expect(obj).not_to respond_to(:foo).with(2).arguments
   end
 
   it "passes if :sym expects 3 or more args" do
     obj = Object.new
     def obj.foo(a, b, c, *arg); end
-    obj.should_not respond_to(:foo).with(2).arguments
+    expect(obj).not_to respond_to(:foo).with(2).arguments
   end
 end
+

data/spec/rspec/matchers/satisfy_spec.rb

@@ -1,44 +1,44 @@
 require 'spec_helper'
 
-describe "should satisfy { block }" do
+describe "expect(...).to satisfy { block }" do
   it_behaves_like "an RSpec matcher", :valid_value => true, :invalid_value => false do
     let(:matcher) { satisfy { |v| v } }
   end
 
   it "describes itself" do
-    satisfy.description.should eq("satisfy block")
+    expect(satisfy.description).to eq("satisfy block")
   end
 
   it "passes if block returns true" do
-    true.should satisfy { |val| val }
-    true.should satisfy do |val|
+    expect(true).to satisfy { |val| val }
+    expect(true).to satisfy do |val|
       val
     end
   end
 
   it "fails if block returns false" do
-    lambda {
-      false.should satisfy { |val| val }
-    }.should fail_with("expected false to satisfy block")
-    lambda do
-      false.should satisfy do |val|
+    expect {
+      expect(false).to satisfy { |val| val }
+    }.to fail_with("expected false to satisfy block")
+    expect do
+      expect(false).to satisfy do |val|
         val
       end
-    end.should fail_with("expected false to satisfy block")
+    end.to fail_with("expected false to satisfy block")
   end
 end
 
-describe "should_not satisfy { block }" do
+describe "expect(...).to_not satisfy { block }" do
   it "passes if block returns false" do
-    false.should_not satisfy { |val| val }
-    false.should_not satisfy do |val|
+    expect(false).not_to satisfy { |val| val }
+    expect(false).not_to satisfy do |val|
       val
     end
   end
 
   it "fails if block returns true" do
-    lambda {
-      true.should_not satisfy { |val| val }
-    }.should fail_with("expected true not to satisfy block")
+    expect {
+      expect(true).not_to satisfy { |val| val }
+    }.to fail_with("expected true not to satisfy block")
   end
 end