Merge fixes for Rubygems 1.8.10.dev from branch '1-0-stable'

Conflicts:
	.travis.yml
	lib/bundler.rb
	lib/bundler/source.rb

2 files changed, 4 insertions, 3 deletions

diff --git a/spec/install/gems/simple_case_spec.rb b/spec/install/gems/simple_case_spec.rb
index 3ae6370f4a..cdf7a0ea50 100644
--- a/spec/install/gems/simple_case_spec.rb
+++ b/spec/install/gems/simple_case_spec.rb
@@ -604,7 +604,7 @@ describe "bundle install with gem sources" do
           Current Bundler version:
             bundler (#{Bundler::VERSION})
         E
-      out.should == nice_error
+      out.should include(nice_error)
     end
 
     it "works for gems with multiple versions in its dependencies" do
diff --git a/spec/update/gems_spec.rb b/spec/update/gems_spec.rb
index dcc6960203..282e13d8c6 100644
--- a/spec/update/gems_spec.rb
+++ b/spec/update/gems_spec.rb
@@ -115,7 +115,8 @@ describe "bundle update when a gem depends on a newer version of bundler" do
 
   it "should explain that bundler conflicted" do
     bundle "update"
-    out.should_not =~ /In snapshot/
-    out.should =~ /Current Bundler version/
+    out.should_not =~ /in snapshot/i
+    out.should =~ /current Bundler version/i
+    out.should =~ /perhaps you need to update bundler/i
   end
 end