rspec 3 expectations

5 files changed, 19 insertions, 17 deletions

diff --git a/spec/bundler/definition_spec.rb b/spec/bundler/definition_spec.rb
index 034a571314..d7362f0372 100644
--- a/spec/bundler/definition_spec.rb
+++ b/spec/bundler/definition_spec.rb
@@ -3,7 +3,7 @@ require 'bundler/definition'
 
 describe Bundler::Definition do
   before do
-    Bundler.stub(:settings){ Bundler::Settings.new(".") }
+    allow(Bundler).to receive(:settings){ Bundler::Settings.new(".") }
   end
 
   describe "#lock" do
@@ -11,7 +11,7 @@ describe Bundler::Definition do
       subject{ Bundler::Definition.new(nil, [], [], []) }
 
       before do
-        File.should_receive(:open).with("Gemfile.lock", "wb").
+        expect(File).to receive(:open).with("Gemfile.lock", "wb").
           and_raise(Errno::EACCES)
       end
 
diff --git a/spec/bundler/dsl_spec.rb b/spec/bundler/dsl_spec.rb
index 610ff0b55e..fd947a09da 100644
--- a/spec/bundler/dsl_spec.rb
+++ b/spec/bundler/dsl_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Bundler::Dsl do
   before do
     @rubygems = double("rubygems")
-    Bundler::Source::Rubygems.stub(:new){ @rubygems }
+    allow(Bundler::Source::Rubygems).to receive(:new){ @rubygems }
   end
 
   describe "#_normalize_options" do
@@ -34,7 +34,7 @@ describe Bundler::Dsl do
 
   describe "#method_missing" do
     it "raises an error for unknown DSL methods" do
-      Bundler.should_receive(:read_file).with("Gemfile").and_return("unknown")
+      expect(Bundler).to receive(:read_file).with("Gemfile").and_return("unknown")
       error_msg = "Undefined local variable or method `unknown'" \
         " for Gemfile\\s+from Gemfile:1"
       expect { subject.eval_gemfile("Gemfile") }.
@@ -44,7 +44,7 @@ describe Bundler::Dsl do
 
   describe "#eval_gemfile" do
     it "handles syntax errors with a useful message" do
-      Bundler.should_receive(:read_file).with("Gemfile").and_return("}")
+      expect(Bundler).to receive(:read_file).with("Gemfile").and_return("}")
       expect { subject.eval_gemfile("Gemfile") }.
         to raise_error(Bundler::GemfileError, /Gemfile syntax error/)
     end
diff --git a/spec/bundler/gem_helper_spec.rb b/spec/bundler/gem_helper_spec.rb
index d3181e076c..3739e7998b 100644
--- a/spec/bundler/gem_helper_spec.rb
+++ b/spec/bundler/gem_helper_spec.rb
@@ -43,7 +43,7 @@ describe "Bundler::GemHelper tasks" do
 
   context "gem management" do
     def mock_confirm_message(message)
-      Bundler.ui.should_receive(:confirm).with(message)
+      expect(Bundler.ui).to receive(:confirm).with(message)
     end
 
     def mock_build_message
@@ -116,7 +116,7 @@ describe "Bundler::GemHelper tasks" do
       end
 
       it "raises an appropriate error when the install fails" do
-        @helper.should_receive(:build_gem) do
+        expect(@helper).to receive(:build_gem) do
           # write an invalid gem file, so we can simulate install failure...
           FileUtils.mkdir_p(File.join(@app.to_s, 'pkg'))
           path = "#{@app.to_s}/pkg/test-0.0.1.gem"
@@ -146,7 +146,9 @@ describe "Bundler::GemHelper tasks" do
       end
 
       it "raises an appropriate error if there is no git remote" do
-        Bundler.ui.stub(:confirm => nil, :error => nil) # silence messages
+        # silence messages
+        allow(Bundler.ui).to receive(:confirm)
+        allow(Bundler.ui).to receive(:error)
 
         Dir.chdir(gem_repo1) { `git init --bare` }
         Dir.chdir(@app) { `git commit -a -m "initial commit"` }
@@ -159,7 +161,7 @@ describe "Bundler::GemHelper tasks" do
         mock_confirm_message(/Tagged v0.0.1/)
         mock_confirm_message("Pushed git commits and tags.")
 
-        @helper.should_receive(:rubygem_push).with(bundled_app('test/pkg/test-0.0.1.gem').to_s)
+        expect(@helper).to receive(:rubygem_push).with(bundled_app('test/pkg/test-0.0.1.gem').to_s)
 
         Dir.chdir(gem_repo1) { `git init --bare` }
         Dir.chdir(@app) do
@@ -175,7 +177,7 @@ describe "Bundler::GemHelper tasks" do
         mock_build_message
         mock_confirm_message("Tag v0.0.1 has already been created.")
 
-        @helper.should_receive(:rubygem_push).with(bundled_app('test/pkg/test-0.0.1.gem').to_s)
+        expect(@helper).to receive(:rubygem_push).with(bundled_app('test/pkg/test-0.0.1.gem').to_s)
 
         Dir.chdir(gem_repo1) {
           `git init --bare`
diff --git a/spec/bundler/safe_catch_spec.rb b/spec/bundler/safe_catch_spec.rb
index 40b6ec092c..22521be520 100644
--- a/spec/bundler/safe_catch_spec.rb
+++ b/spec/bundler/safe_catch_spec.rb
@@ -1,8 +1,8 @@
 # encoding: utf-8
 require 'spec_helper'
 require 'bundler'
-require "bundler/safe_catch"
-require "bundler/current_ruby"
+require 'bundler/safe_catch'
+require 'bundler/current_ruby'
 
 class RecursiveTmpResolver
   include Bundler::SafeCatch
@@ -13,8 +13,8 @@ describe Bundler::SafeCatch do
 
   it "should use safe_catch on jruby" do
     if Bundler.current_ruby.jruby?
-      Bundler::SafeCatch::Internal.should_receive(:catch).and_call_original
-      Bundler::SafeCatch::Internal.should_receive(:throw).and_call_original
+      expect(Bundler::SafeCatch::Internal).to receive(:catch).and_call_original
+      expect(Bundler::SafeCatch::Internal).to receive(:throw).and_call_original
 
       retval = resolver.safe_catch(:resolve) do
         resolver.safe_throw(:resolve, "good bye world")
@@ -25,8 +25,8 @@ describe Bundler::SafeCatch do
 
   it "should use regular catch/throw on MRI" do
     if Bundler.current_ruby.mri?
-      Bundler::SafeCatch::Internal.should_not_receive(:catch)
-      Bundler::SafeCatch::Internal.should_not_receive(:throw)
+      expect(Bundler::SafeCatch::Internal).to_not receive(:catch)
+      expect(Bundler::SafeCatch::Internal).to_not receive(:throw)
 
       retval = resolver.safe_catch(:resolve) do
         resolver.safe_throw(:resolve, "good bye world")
diff --git a/spec/bundler/source_spec.rb b/spec/bundler/source_spec.rb
index c51d4b9925..0d49660317 100644
--- a/spec/bundler/source_spec.rb
+++ b/spec/bundler/source_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Bundler::Source::Rubygems do
   before do
-    Bundler.stub(:root){ Pathname.new("root") }
+    allow(Bundler).to receive(:root){ Pathname.new("root") }
   end
 
   describe "caches" do