rspec-mocks 2.12.1 → 2.12.2

data/spec/rspec/mocks/stubbed_message_expectations_spec.rb

@@ -5,7 +5,7 @@ describe "expection set on previously stubbed method" do
     double = double(:msg => nil)
     double.msg
     double.should_receive(:msg)
-    lambda { double.rspec_verify }.should raise_error(RSpec::Mocks::MockExpectationError)
+    expect { double.rspec_verify }.to raise_error(RSpec::Mocks::MockExpectationError)
   end
 
   it "outputs arguments of similar calls" do
@@ -13,9 +13,9 @@ describe "expection set on previously stubbed method" do
     double.should_receive(:foo).with('first')
     double.foo('second')
     double.foo('third')
-    lambda do
+    expect {
       double.rspec_verify
-    end.should raise_error(%Q|Double "double" received :foo with unexpected arguments\n  expected: ("first")\n       got: ("second"), ("third")|)
+    }.to raise_error(%Q|Double "double" received :foo with unexpected arguments\n  expected: ("first")\n       got: ("second"), ("third")|)
     double.rspec_reset
   end
 

data/spec/rspec/mocks/test_double_spec.rb

@@ -23,7 +23,7 @@ module RSpec
 
         double = Module.new { TestDouble.extend_onto(self) }
         double.should_receive(:use).and_return(:ok)
-        double.use.should be(:ok)
+        expect(double.use).to be(:ok)
       end
 
       it 'sets the test double name when a name is passed' do
@@ -36,8 +36,8 @@ module RSpec
           TestDouble.extend_onto(self, "MyDouble", :a => 5, :b => 10)
         end
 
-        double.a.should eq(5)
-        double.b.should eq(10)
+        expect(double.a).to eq(5)
+        expect(double.b).to eq(10)
       end
 
       it 'indicates what type of test double it is in error messages' do

data/spec/rspec/mocks/to_ary_spec.rb

@@ -4,27 +4,27 @@ describe "a double receiving to_ary" do
   shared_examples "to_ary" do
     it "returns nil" do
       expect do
-        obj.to_ary.should be_nil
+        expect(obj.to_ary).to be_nil
       end.to raise_error(NoMethodError)
     end
-    
+
     it "doesn't respond" do
-      obj.should_not respond_to(:to_ary)
+      expect(obj).not_to respond_to(:to_ary)
     end
 
     it "can be overridden with a stub" do
       obj.stub(:to_ary) { :non_nil_value }
-      obj.to_ary.should be(:non_nil_value)
+      expect(obj.to_ary).to be(:non_nil_value)
     end
-    
+
     it "responds when overriden" do
       obj.stub(:to_ary) { :non_nil_value }
-      obj.should respond_to(:to_ary)
+      expect(obj).to respond_to(:to_ary)
     end
 
     it "supports Array#flatten" do
       obj = double('foo')
-      [obj].flatten.should eq([obj])
+      expect([obj].flatten).to eq([obj])
     end
   end
 

data/spec/rspec/mocks/twice_counts_spec.rb

@@ -32,33 +32,33 @@ module RSpec
         @double.should_receive(:do_something).twice
         @double.do_something
         @double.do_something
-        lambda do
+        expect {
           @double.do_something
-        end.should raise_error(RSpec::Mocks::MockExpectationError)
+        }.to raise_error(RSpec::Mocks::MockExpectationError)
       end
 
       it "fails when call count is lower than expected" do
         @double.should_receive(:do_something).twice
         @double.do_something
-        lambda do
+        expect {
           @double.rspec_verify
-        end.should raise_error(RSpec::Mocks::MockExpectationError)
+        }.to raise_error(RSpec::Mocks::MockExpectationError)
       end
 
       it "fails when called wrong args on the first call" do
         @double.should_receive(:do_something).twice.with("1", 1)
-        lambda do
+        expect {
           @double.do_something(1, "1")
-        end.should raise_error(RSpec::Mocks::MockExpectationError)
+        }.to raise_error(RSpec::Mocks::MockExpectationError)
         @double.rspec_reset
       end
 
       it "fails when called with wrong args on the second call" do
         @double.should_receive(:do_something).twice.with("1", 1)
         @double.do_something("1", 1)
-        lambda do
+        expect {
           @double.do_something(1, "1")
-        end.should raise_error(RSpec::Mocks::MockExpectationError)
+        }.to raise_error(RSpec::Mocks::MockExpectationError)
         @double.rspec_reset
       end
     end

data/spec/rspec/mocks_spec.rb

@@ -15,7 +15,7 @@ describe RSpec::Mocks do
         RSpec::Mocks::setup(Object.new)
         space = RSpec::Mocks::space
         RSpec::Mocks::setup(Object.new)
-        RSpec::Mocks::space.should equal(space)
+        expect(RSpec::Mocks::space).to equal(space)
       end
     end
 
@@ -23,7 +23,7 @@ describe RSpec::Mocks do
       it "initializes a Mock::Space" do
         RSpec::Mocks::space = nil
         RSpec::Mocks::setup(Object.new)
-        RSpec::Mocks::space.should_not be_nil
+        expect(RSpec::Mocks::space).not_to be_nil
       end
     end
   end
@@ -51,8 +51,17 @@ describe RSpec::Mocks do
 
   describe ".configuration" do
     it 'returns a memoized configuration instance' do
-      RSpec::Mocks.configuration.should be_a(RSpec::Mocks::Configuration)
-      RSpec::Mocks.configuration.should be(RSpec::Mocks.configuration)
+      expect(RSpec::Mocks.configuration).to be_a(RSpec::Mocks::Configuration)
+      expect(RSpec::Mocks.configuration).to be(RSpec::Mocks.configuration)
+    end
+  end
+
+  context 'when requiring spec/mocks (as was valid for rspec 1)' do
+    it 'prints a deprecation warning' do
+      ::RSpec::Mocks.should_receive(:warn_deprecation).
+        with(%r|spec/mocks|)
+
+      load "spec/mocks.rb"
     end
   end
 end

data/spec/spec_helper.rb

@@ -19,6 +19,10 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run_including :focus
 
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = :expect
+  end
+
   old_verbose = nil
   config.before(:each, :silence_warnings) do
     old_verbose = $VERBOSE

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-mocks
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 2
   - 12
-  - 1
-  version: 2.12.1
+  - 2
+  version: 2.12.2
 platform: ruby
 authors: 
 - Steven Baker
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-21 00:00:00 Z
+date: 2013-01-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -222,7 +222,7 @@ rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.12.1
+summary: rspec-mocks-2.12.2
 test_files: 
 - features/README.md
 - features/Scope.md