bundler 1.2.5 → 1.3.0.pre

data/spec/other/ext_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Gem::Specification#match_platform" do
   it "does not match platforms other than the gem platform" do
     darwin = gem "lol", "1.0", "platform_specific-1.0-x86-darwin-10"
-    darwin.match_platform(pl('java')).should be_false
+    expect(darwin.match_platform(pl('java'))).to be_false
   end
 end
 
@@ -11,7 +11,7 @@ describe "Bundler::GemHelpers#generic" do
   include Bundler::GemHelpers
 
   it "converts non-windows platforms into ruby" do
-    generic(pl('x86-darwin-10')).should == pl('ruby')
+    expect(generic(pl('x86-darwin-10'))).to eq(pl('ruby'))
   end
 end
 
@@ -34,4 +34,4 @@ describe "Gem::SourceIndex#refresh!" do
     run "Gem.source_index.refresh!"
     run "Gem::SourceIndex.from_gems_in([]).refresh!"
   end
-end
+end

data/spec/other/help_spec.rb

@@ -7,33 +7,33 @@ describe "bundle help" do
     system_gems "bundler-0.8.1"
 
     bundle "help", :expect_err => true
-    err.should include("Please remove Bundler 0.8 versions.")
-    err.should include("This can be done by running `gem cleanup bundler`.")
+    expect(err).to include("Please remove Bundler 0.8 versions.")
+    expect(err).to include("This can be done by running `gem cleanup bundler`.")
   end
 
   it "uses groff when available" do
     fake_groff!
 
     bundle "help gemfile"
-    out.should == %|["-Wall", "-mtty-char", "-mandoc", "-Tascii", "#{root}/lib/bundler/man/gemfile.5"]|
+    expect(out).to eq(%|["-Wall", "-mtty-char", "-mandoc", "-Tascii", "#{root}/lib/bundler/man/gemfile.5"]|)
   end
 
   it "prefixes bundle commands with bundle- when finding the groff files" do
     fake_groff!
 
     bundle "help install"
-    out.should == %|["-Wall", "-mtty-char", "-mandoc", "-Tascii", "#{root}/lib/bundler/man/bundle-install"]|
+    expect(out).to eq(%|["-Wall", "-mtty-char", "-mandoc", "-Tascii", "#{root}/lib/bundler/man/bundle-install"]|)
   end
 
   it "simply outputs the txt file when there is no groff on the path" do
     kill_path!
 
     bundle "help install", :expect_err => true
-    out.should =~ /BUNDLE-INSTALL/
+    expect(out).to match(/BUNDLE-INSTALL/)
   end
 
   it "still outputs the old help for commands that do not have man pages yet" do
     bundle "help check"
-    out.should include("Check searches the local machine")
+    expect(out).to include("Check searches the local machine")
   end
 end

data/spec/other/init_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe "bundle init" do
   it "generates a Gemfile" do
     bundle :init
-    bundled_app("Gemfile").should exist
+    expect(bundled_app("Gemfile")).to exist
   end
 
   it "does not change existing Gemfiles" do
@@ -11,9 +11,9 @@ describe "bundle init" do
       gem "rails"
     G
 
-    lambda {
+    expect {
       bundle :init
-    }.should_not change { File.read(bundled_app("Gemfile")) }
+    }.not_to change { File.read(bundled_app("Gemfile")) }
   end
 
   it "should generate from an existing gemspec" do
@@ -31,10 +31,10 @@ describe "bundle init" do
     bundle :init, :gemspec => spec_file
 
     gemfile = bundled_app("Gemfile").read
-    gemfile.should =~ /source :gemcutter/
-    gemfile.scan(/gem "rack", "= 1.0.1"/).size.should eq(1)
-    gemfile.scan(/gem "rspec", "= 1.2"/).size.should eq(1)
-    gemfile.scan(/group :development/).size.should eq(1)
+    expect(gemfile).to match(/source :gemcutter/)
+    expect(gemfile.scan(/gem "rack", "= 1.0.1"/).size).to eq(1)
+    expect(gemfile.scan(/gem "rspec", "= 1.2"/).size).to eq(1)
+    expect(gemfile.scan(/group :development/).size).to eq(1)
   end
 
-end
+end

data/spec/other/newgem_spec.rb

@@ -19,30 +19,30 @@ describe "bundle gem" do
   let(:generated_gem) { Bundler::GemHelper.new(bundled_app("test-gem").to_s) }
 
   it "generates a gem skeleton" do
-    bundled_app("test-gem/test-gem.gemspec").should exist
-    bundled_app("test-gem/LICENSE.txt").should exist
-    bundled_app("test-gem/Gemfile").should exist
-    bundled_app("test-gem/Rakefile").should exist
-    bundled_app("test-gem/lib/test-gem.rb").should exist
-    bundled_app("test-gem/lib/test-gem/version.rb").should exist
+    expect(bundled_app("test-gem/test-gem.gemspec")).to exist
+    expect(bundled_app("test-gem/LICENSE.txt")).to exist
+    expect(bundled_app("test-gem/Gemfile")).to exist
+    expect(bundled_app("test-gem/Rakefile")).to exist
+    expect(bundled_app("test-gem/lib/test-gem.rb")).to exist
+    expect(bundled_app("test-gem/lib/test-gem/version.rb")).to exist
   end
 
   it "starts with version 0.0.1" do
-    bundled_app("test-gem/lib/test-gem/version.rb").read.should =~ /VERSION = "0.0.1"/
+    expect(bundled_app("test-gem/lib/test-gem/version.rb").read).to match(/VERSION = "0.0.1"/)
   end
 
   it "nests constants so they work" do
-    bundled_app("test-gem/lib/test-gem/version.rb").read.should =~ /module Test\n  module Gem/
-    bundled_app("test-gem/lib/test-gem.rb").read.should =~ /module Test\n  module Gem/
+    expect(bundled_app("test-gem/lib/test-gem/version.rb").read).to match(/module Test\n  module Gem/)
+    expect(bundled_app("test-gem/lib/test-gem.rb").read).to match(/module Test\n  module Gem/)
   end
 
   context "git config user.{name,email} present" do
     it "sets gemspec author to git user.name if available" do
-      generated_gem.gemspec.authors.first.should == "Bundler User"
+      expect(generated_gem.gemspec.authors.first).to eq("Bundler User")
     end
 
     it "sets gemspec email to git user.email if available" do
-      generated_gem.gemspec.email.first.should == "user@example.com"
+      expect(generated_gem.gemspec.email.first).to eq("user@example.com")
     end
   end
 
@@ -56,16 +56,20 @@ describe "bundle gem" do
     end
 
     it "sets gemspec author to default message if git user.name is not set or empty" do
-      generated_gem.gemspec.authors.first.should == "TODO: Write your name"
+      expect(generated_gem.gemspec.authors.first).to eq("TODO: Write your name")
     end
 
     it "sets gemspec email to default message if git user.email is not set or empty" do
-      generated_gem.gemspec.email.first.should == "TODO: Write your email address"
+      expect(generated_gem.gemspec.email.first).to eq("TODO: Write your email address")
     end
   end
 
+  it "sets gemspec license to MIT by default" do
+    expect(generated_gem.gemspec.license).to eq("MIT")
+  end
+
   it "requires the version file" do
-    bundled_app("test-gem/lib/test-gem.rb").read.should =~ /require "test-gem\/version"/
+    expect(bundled_app("test-gem/lib/test-gem.rb").read).to match(/require "test-gem\/version"/)
   end
 
   it "runs rake without problems" do
@@ -82,7 +86,83 @@ RAKEFILE
 
     Dir.chdir(bundled_app("test-gem")) do
       sys_exec("rake")
-      out.should include("SUCCESS")
+      expect(out).to include("SUCCESS")
+    end
+  end
+
+  context "--bin parameter set" do
+    before :each do
+      reset!
+      in_app_root
+      bundle 'gem test-gem --bin'
+    end
+
+    it "builds bin skeleton" do
+      expect(bundled_app("test-gem/bin/test-gem")).to exist
+    end
+
+    it "requires 'test-gem'" do
+      expect(bundled_app("test-gem/bin/test-gem").read).to match(/require 'test-gem'/)
+    end
+  end
+
+  context "--test parameter set to rspec" do
+    before :each do
+      reset!
+      in_app_root
+      bundle "gem test-gem --test=rspec"
+    end
+
+    it "builds spec skeleton" do
+      expect(bundled_app("test-gem/.rspec")).to exist
+      expect(bundled_app("test-gem/spec/test-gem_spec.rb")).to exist
+      expect(bundled_app("test-gem/spec/spec_helper.rb")).to exist
+    end
+
+    it "requires 'test-gem'" do
+      expect(bundled_app("test-gem/spec/spec_helper.rb").read).to match(/require 'test-gem'/)
+    end
+
+    it "creates a default test which fails" do
+      expect(bundled_app("test-gem/spec/test-gem_spec.rb").read).to match(/false.should be_true/)
+    end
+  end
+
+  context "--test parameter set to minitest" do
+    before :each do
+      reset!
+      in_app_root
+      bundle "gem test-gem --test=minitest"
+    end
+
+    it "builds spec skeleton" do
+      expect(bundled_app("test-gem/test/test_test-gem.rb")).to exist
+      expect(bundled_app("test-gem/test/minitest_helper.rb")).to exist
+    end
+
+    it "requires 'test-gem'" do
+      expect(bundled_app("test-gem/test/minitest_helper.rb").read).to match(/require 'test-gem'/)
+    end
+
+    it "requires 'minitest_helper'" do
+      expect(bundled_app("test-gem/test/test_test-gem.rb").read).to match(/require '.\/minitest_helper'/)
+    end
+
+    it "creates a default test which fails" do
+      expect(bundled_app("test-gem/test/test_test-gem.rb").read).to match(/assert false/)
+    end
+  end
+
+  context "--test with no arguments" do
+    before :each do
+      reset!
+      in_app_root
+      bundle "gem test-gem --test"
+    end
+
+    it "defaults to rspec" do
+      expect(bundled_app("test-gem/spec/spec_helper.rb")).to exist
+      expect(bundled_app("test-gem/test/minitest_helper.rb")).to_not exist
     end
   end
 end

data/spec/other/open_spec.rb

@@ -10,26 +10,31 @@ describe "bundle open" do
 
   it "opens the gem with BUNDLER_EDITOR as highest priority" do
     bundle "open rails", :env => {"EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor"}
-    out.should == "bundler_editor #{default_bundle_path('gems', 'rails-2.3.2')}"
+    expect(out).to eq("bundler_editor #{default_bundle_path('gems', 'rails-2.3.2')}")
   end
 
   it "opens the gem with VISUAL as 2nd highest priority" do
     bundle "open rails", :env => {"EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => ""}
-    out.should == "visual #{default_bundle_path('gems', 'rails-2.3.2')}"
+    expect(out).to eq("visual #{default_bundle_path('gems', 'rails-2.3.2')}")
   end
 
   it "opens the gem with EDITOR as 3rd highest priority" do
     bundle "open rails", :env => {"EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => ""}
-    out.should == "editor #{default_bundle_path('gems', 'rails-2.3.2')}"
+    expect(out).to eq("editor #{default_bundle_path('gems', 'rails-2.3.2')}")
   end
 
   it "complains if no EDITOR is set" do
     bundle "open rails", :env => {"EDITOR" => "", "VISUAL" => "", "BUNDLER_EDITOR" => ""}
-    out.should == "To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR"
+    expect(out).to eq("To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR")
   end
 
   it "complains if gem not in bundle" do
     bundle "open missing", :env => {"EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => ""}
-    out.should match(/could not find gem 'missing'/i)
+    expect(out).to match(/could not find gem 'missing'/i)
+  end
+
+  it "suggests alternatives for similar-sounding gems" do
+    bundle "open Rails", :env => {"EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => ""}
+    expect(out).to match(/did you mean rails\?/i)
   end
 end

data/spec/other/outdated_spec.rb

@@ -22,8 +22,8 @@ describe "bundle outdated" do
       end
 
       bundle "outdated"
-      out.should include("activesupport (3.0 > 2.3.5)")
-      out.should include("foo (1.0")
+      expect(out).to include("activesupport (3.0 > 2.3.5)")
+      expect(out).to include("foo (1.0")
     end
   end
 
@@ -32,7 +32,7 @@ describe "bundle outdated" do
       FileUtils.rm_rf(gem_repo2)
 
       bundle "outdated --local"
-      out.should_not match(/Fetching/)
+      expect(out).not_to match(/Fetching/)
     end
   end
 
@@ -44,8 +44,8 @@ describe "bundle outdated" do
       end
 
       bundle "outdated foo"
-      out.should_not include("activesupport (3.0 > 2.3.5)")
-      out.should include("foo (1.0")
+      expect(out).not_to include("activesupport (3.0 > 2.3.5)")
+      expect(out).to include("foo (1.0")
     end
   end
 
@@ -57,7 +57,7 @@ describe "bundle outdated" do
         end
 
         bundle "outdated"
-        out.should_not include("activesupport (3.0.0.beta > 2.3.5)")
+        expect(out).not_to include("activesupport (3.0.0.beta > 2.3.5)")
       end
     end
 
@@ -68,7 +68,7 @@ describe "bundle outdated" do
         end
 
         bundle "outdated --pre"
-        out.should include("activesupport (3.0.0.beta > 2.3.5)")
+        expect(out).to include("activesupport (3.0.0.beta > 2.3.5)")
       end
     end
 
@@ -85,7 +85,7 @@ describe "bundle outdated" do
         G
 
         bundle "outdated"
-        out.should include("activesupport (3.0.0.beta.2 > 3.0.0.beta.1)")
+        expect(out).to include("activesupport (3.0.0.beta.2 > 3.0.0.beta.1)")
       end
     end
   end

data/spec/other/platform_spec.rb

@@ -12,7 +12,7 @@ describe "bundle platform" do
       G
 
       bundle "platform"
-      out.should == <<-G.chomp
+      expect(out).to eq(<<-G.chomp)
 Your platform is: #{RUBY_PLATFORM}
 
 Your app has gems that work on these platforms:
@@ -33,7 +33,7 @@ G
       G
 
       bundle "platform"
-      out.should == <<-G.chomp
+      expect(out).to eq(<<-G.chomp)
 Your platform is: #{RUBY_PLATFORM}
 
 Your app has gems that work on these platforms:
@@ -53,7 +53,7 @@ G
       G
 
       bundle "platform"
-      out.should == <<-G.chomp
+      expect(out).to eq(<<-G.chomp)
 Your platform is: #{RUBY_PLATFORM}
 
 Your app has gems that work on these platforms:
@@ -78,7 +78,7 @@ G
 
       bundle "platform --ruby"
 
-      out.should eq("ruby 1.9.3")
+      expect(out).to eq("ruby 1.9.3")
     end
 
     it "engine defaults to MRI" do
@@ -91,7 +91,7 @@ G
 
       bundle "platform --ruby"
 
-      out.should eq("ruby 1.9.3")
+      expect(out).to eq("ruby 1.9.3")
     end
 
     it "handles jruby" do
@@ -104,7 +104,7 @@ G
 
       bundle "platform --ruby"
 
-      out.should eq("ruby 1.8.7 (jruby 1.6.5)")
+      expect(out).to eq("ruby 1.8.7 (jruby 1.6.5)")
     end
 
     it "handles rbx" do
@@ -117,7 +117,7 @@ G
 
       bundle "platform --ruby"
 
-      out.should eq("ruby 1.8.7 (rbx 1.2.4)")
+      expect(out).to eq("ruby 1.8.7 (rbx 1.2.4)")
     end
 
     it "raises an error if engine is used but engine version is not" do
@@ -130,7 +130,7 @@ G
 
       bundle "platform", :exitstatus => true
 
-      exitstatus.should_not == 0
+      expect(exitstatus).not_to eq(0)
     end
 
     it "raises an error if engine_version is used but engine is not" do
@@ -143,7 +143,7 @@ G
 
       bundle "platform", :exitstatus => true
 
-      exitstatus.should_not == 0
+      expect(exitstatus).not_to eq(0)
     end
 
     it "raises an error if engine version doesn't match ruby version for mri" do
@@ -156,7 +156,7 @@ G
 
       bundle "platform", :exitstatus => true
 
-      exitstatus.should_not == 0
+      expect(exitstatus).not_to eq(0)
     end
 
     it "should print if no ruby version is specified" do
@@ -169,7 +169,7 @@ G
       bundle "platform --ruby"
       puts err
 
-      out.should eq("No ruby version specified")
+      expect(out).to eq("No ruby version specified")
     end
   end
 
@@ -180,18 +180,18 @@ G
   let(:engine_version_incorrect) { "ruby \"#{RUBY_VERSION}\", :engine => \"#{local_ruby_engine}\", :engine_version => \"#{not_local_engine_version}\"" }
 
   def should_be_ruby_version_incorrect(opts = {:exitstatus => true})
-    exitstatus.should eq(18) if opts[:exitstatus]
-    out.should be_include("Your Ruby version is #{RUBY_VERSION}, but your Gemfile specified #{not_local_ruby_version}")
+    expect(exitstatus).to eq(18) if opts[:exitstatus]
+    expect(out).to be_include("Your Ruby version is #{RUBY_VERSION}, but your Gemfile specified #{not_local_ruby_version}")
   end
 
   def should_be_engine_incorrect(opts = {:exitstatus => true})
-    exitstatus.should eq(18) if opts[:exitstatus]
-    out.should be_include("Your Ruby engine is #{local_ruby_engine}, but your Gemfile specified #{not_local_tag}")
+    expect(exitstatus).to eq(18) if opts[:exitstatus]
+    expect(out).to be_include("Your Ruby engine is #{local_ruby_engine}, but your Gemfile specified #{not_local_tag}")
   end
 
   def should_be_engine_version_incorrect(opts = {:exitstatus => true})
-    exitstatus.should eq(18) if opts[:exitstatus]
-    out.should be_include("Your #{local_ruby_engine} version is #{local_engine_version}, but your Gemfile specified #{local_ruby_engine} #{not_local_engine_version}")
+    expect(exitstatus).to eq(18) if opts[:exitstatus]
+    expect(out).to be_include("Your #{local_ruby_engine} version is #{local_engine_version}, but your Gemfile specified #{local_ruby_engine} #{not_local_engine_version}")
   end
 
   context "bundle install" do
@@ -203,7 +203,7 @@ G
         #{ruby_version_correct}
       G
 
-      bundled_app('Gemfile.lock').should exist
+      expect(bundled_app('Gemfile.lock')).to exist
     end
 
     it "installs fine with any engine" do
@@ -215,7 +215,7 @@ G
           #{ruby_version_correct_engineless}
         G
 
-        bundled_app('Gemfile.lock').should exist
+        expect(bundled_app('Gemfile.lock')).to exist
       end
     end
 
@@ -227,7 +227,7 @@ G
         #{ruby_version_incorrect}
       G
 
-      bundled_app('Gemfile.lock').should_not exist
+      expect(bundled_app('Gemfile.lock')).not_to exist
       should_be_ruby_version_incorrect
     end
 
@@ -239,7 +239,7 @@ G
         #{engine_incorrect}
       G
 
-      bundled_app('Gemfile.lock').should_not exist
+      expect(bundled_app('Gemfile.lock')).not_to exist
       should_be_engine_incorrect
     end
 
@@ -252,7 +252,7 @@ G
           #{engine_version_incorrect}
         G
 
-        bundled_app('Gemfile.lock').should_not exist
+        expect(bundled_app('Gemfile.lock')).not_to exist
         should_be_engine_version_incorrect
       end
     end
@@ -273,8 +273,8 @@ G
       G
 
       bundle :check, :exitstatus => true
-      exitstatus.should eq(0)
-      out.should == "The Gemfile's dependencies are satisfied"
+      expect(exitstatus).to eq(0)
+      expect(out).to eq("The Gemfile's dependencies are satisfied")
     end
 
     it "checks fine with any engine" do
@@ -292,8 +292,8 @@ G
         G
 
         bundle :check, :exitstatus => true
-        exitstatus.should eq(0)
-        out.should == "The Gemfile's dependencies are satisfied"
+        expect(exitstatus).to eq(0)
+        expect(out).to eq("The Gemfile's dependencies are satisfied")
       end
     end
 
@@ -464,7 +464,7 @@ G
       G
 
       bundle "show rails"
-      out.should == default_bundle_path('gems', 'rails-2.3.2').to_s
+      expect(out).to eq(default_bundle_path('gems', 'rails-2.3.2').to_s)
     end
 
     it "prints path if ruby version is correct for any engine" do
@@ -477,7 +477,7 @@ G
         G
 
         bundle "show rails"
-        out.should == default_bundle_path('gems', 'rails-2.3.2').to_s
+        expect(out).to eq(default_bundle_path('gems', 'rails-2.3.2').to_s)
       end
     end
 
@@ -537,7 +537,7 @@ G
       G
 
       bundle :cache
-      bundled_app("vendor/cache/rack-1.0.0.gem").should exist
+      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
     end
 
     it "copies the .gem file to vendor/cache when ruby version matches for any engine" do
@@ -549,7 +549,7 @@ G
         G
 
         bundle :cache
-        bundled_app("vendor/cache/rack-1.0.0.gem").should exist
+        expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
       end
     end
 
@@ -606,7 +606,7 @@ G
       G
 
       bundle :pack
-      bundled_app("vendor/cache/rack-1.0.0.gem").should exist
+      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
     end
 
     it "copies the .gem file to vendor/cache when ruby version matches any engine" do
@@ -618,7 +618,7 @@ G
         G
 
         bundle :pack
-        bundled_app("vendor/cache/rack-1.0.0.gem").should exist
+        expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
       end
     end
 
@@ -671,7 +671,7 @@ G
       G
 
       bundle "exec rackup"
-      out.should == "0.9.1"
+      expect(out).to eq("0.9.1")
     end
 
     it "activates the correct gem when ruby version matches any engine" do
@@ -683,7 +683,7 @@ G
         G
 
         bundle "exec rackup"
-        out.should == "0.9.1"
+        expect(out).to eq("0.9.1")
       end
     end
 
@@ -747,7 +747,7 @@ G
         input.puts("puts RACK")
         input.puts("exit")
       end
-      out.should include("0.9.1")
+      expect(out).to include("0.9.1")
     end
 
     it "starts IRB with the default group loaded when ruby version matches any engine" do
@@ -765,7 +765,7 @@ G
           input.puts("puts RACK")
           input.puts("exit")
         end
-        out.should include("0.9.1")
+        expect(out).to include("0.9.1")
       end
     end
 
@@ -837,7 +837,7 @@ G
       FileUtils.rm(bundled_app("Gemfile.lock"))
 
       run "1"
-      bundled_app("Gemfile.lock").should exist
+      expect(bundled_app("Gemfile.lock")).to exist
     end
 
     it "makes a Gemfile.lock if setup succeeds for any engine" do
@@ -855,7 +855,7 @@ G
         FileUtils.rm(bundled_app("Gemfile.lock"))
 
         run "1"
-        bundled_app("Gemfile.lock").should exist
+        expect(bundled_app("Gemfile.lock")).to exist
       end
     end
 
@@ -883,7 +883,7 @@ G
         end
       R
 
-      bundled_app("Gemfile.lock").should_not exist
+      expect(bundled_app("Gemfile.lock")).not_to exist
       should_be_ruby_version_incorrect(:exitstatus => false)
     end
 
@@ -911,7 +911,7 @@ G
         end
       R
 
-      bundled_app("Gemfile.lock").should_not exist
+      expect(bundled_app("Gemfile.lock")).not_to exist
       should_be_engine_incorrect(:exitstatus => false)
     end
 
@@ -940,7 +940,7 @@ G
           end
         R
 
-        bundled_app("Gemfile.lock").should_not exist
+        expect(bundled_app("Gemfile.lock")).not_to exist
         should_be_engine_version_incorrect(:exitstatus => false)
       end
     end
@@ -974,8 +974,8 @@ G
       G
 
       bundle "outdated"
-      out.should include("activesupport (3.0 > 2.3.5)")
-      out.should include("foo (1.0")
+      expect(out).to include("activesupport (3.0 > 2.3.5)")
+      expect(out).to include("foo (1.0")
     end
 
     it "returns list of outdated gems when the ruby version matches for any engine" do
@@ -994,8 +994,8 @@ G
         G
 
         bundle "outdated"
-        out.should include("activesupport (3.0 > 2.3.5)")
-        out.should include("foo (1.0")
+        expect(out).to include("activesupport (3.0 > 2.3.5)")
+        expect(out).to include("foo (1.0")
       end
     end