From 7235f9e2c5a74f65f6b060850adb3946ae08e1df Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Thu, 6 Feb 2014 16:47:15 +0200
Subject: a bit of missed RSpec 3 cleanup

---
 lib/bundler/templates/newgem/spec/newgem_spec.rb.tt |  2 +-
 spec/commands/newgem_spec.rb                        | 14 +++++++-------
 spec/install/gemfile/git_spec.rb                    |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt b/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
index 32ca23454e..920d48ef50 100644
--- a/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
+++ b/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
@@ -6,6 +6,6 @@ describe <%= config[:constant_name] %> do
   end
 
   it 'should do something useful' do
-    false.should eq(true)
+    expect(false).to eq(true)
   end
 end
diff --git a/spec/commands/newgem_spec.rb b/spec/commands/newgem_spec.rb
index 3cc6e36fa1..17ef9f6f36 100644
--- a/spec/commands/newgem_spec.rb
+++ b/spec/commands/newgem_spec.rb
@@ -150,11 +150,11 @@ describe "bundle gem" do
       end
 
       it "requires 'test-gem'" do
-        expect(bundled_app("test_gem/spec/spec_helper.rb").read).to match(/require 'test_gem'/)
+        expect(bundled_app("test_gem/spec/spec_helper.rb").read).to include("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 eq(true)/)
+        expect(bundled_app("test_gem/spec/test_gem_spec.rb").read).to include("expect(false).to eq(true)")
       end
     end
 
@@ -171,15 +171,15 @@ describe "bundle gem" do
       end
 
       it "requires 'test-gem'" do
-        expect(bundled_app("test_gem/test/minitest_helper.rb").read).to match(/require 'test_gem'/)
+        expect(bundled_app("test_gem/test/minitest_helper.rb").read).to include("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'/)
+        expect(bundled_app("test_gem/test/test_test_gem.rb").read).to include("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/)
+        expect(bundled_app("test_gem/test/test_test_gem.rb").read).to include("assert false")
       end
     end
 
@@ -326,11 +326,11 @@ describe "bundle gem" do
       end
 
       it "requires 'test/gem'" do
-        expect(bundled_app("test-gem/spec/spec_helper.rb").read).to match(/require 'test\/gem'/)
+        expect(bundled_app("test-gem/spec/spec_helper.rb").read).to include("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 eq(true)/)
+        expect(bundled_app("test-gem/spec/test/gem_spec.rb").read).to include("expect(false).to eq(true)")
       end
 
       it "creates a default rake task to run the specs" do
diff --git a/spec/install/gemfile/git_spec.rb b/spec/install/gemfile/git_spec.rb
index 14910e64db..4933727b36 100644
--- a/spec/install/gemfile/git_spec.rb
+++ b/spec/install/gemfile/git_spec.rb
@@ -27,7 +27,7 @@ describe "bundle install with git sources" do
     end
 
     it "caches the git repo" do
-      expect(Dir["#{default_bundle_path}/cache/bundler/git/foo-1.0-*"]).to have(1).item
+      expect(Dir["#{default_bundle_path}/cache/bundler/git/foo-1.0-*"].size).to eq(1)
     end
 
     it "caches the evaluated gemspec" do
-- 
cgit v1.2.1