Update specs for prettier version conflict messages

5 files changed, 16 insertions, 15 deletions

diff --git a/spec/install/bundler_spec.rb b/spec/install/bundler_spec.rb
index 930d7095fc..883b0fd694 100644
--- a/spec/install/bundler_spec.rb
+++ b/spec/install/bundler_spec.rb
@@ -41,7 +41,7 @@ describe "bundle install" do
         Resolving dependencies...
         Bundler could not find compatible versions for gem "bundler":
           In Gemfile:
-            bundler (= 0.9.2) ruby
+            bundler (= 0.9.2)
 
           Current Bundler version:
             bundler (#{Bundler::VERSION})
@@ -98,11 +98,11 @@ describe "bundle install" do
         Resolving dependencies...
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
-            activemerchant (>= 0) ruby depends on
-              activesupport (>= 2.0.0) ruby
+            activemerchant depends on
+              activesupport (>= 2.0.0)
 
-            rails_fail (>= 0) ruby depends on
-              activesupport (= 1.2.3) ruby
+            rails_fail depends on
+              activesupport (= 1.2.3)
       E
       expect(out).to eq(nice_error)
     end
@@ -119,10 +119,10 @@ describe "bundle install" do
         Resolving dependencies...
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
-            rails_fail (>= 0) ruby depends on
-              activesupport (= 1.2.3) ruby
+            rails_fail depends on
+              activesupport (= 1.2.3)
 
-            activesupport (= 2.3.5) ruby
+            activesupport (= 2.3.5)
       E
       expect(out).to eq(nice_error)
     end
diff --git a/spec/install/gems/flex_spec.rb b/spec/install/gems/flex_spec.rb
index d6ff15bf08..ee304dd4aa 100644
--- a/spec/install/gems/flex_spec.rb
+++ b/spec/install/gems/flex_spec.rb
@@ -200,11 +200,11 @@ describe "bundle flex_install" do
             rack (= 0.9.1)
 
           In Gemfile:
-            rack_middleware (>= 0) ruby depends on
-              rack (= 0.9.1) ruby
+            rack-obama (= 2.0) depends on
+              rack (= 1.2)
 
-            rack-obama (= 2.0) ruby depends on
-              rack (= 1.2) ruby
+            rack_middleware depends on
+              rack (= 0.9.1)  
 
         Running `bundle update` will rebuild your snapshot from scratch, using only
         the gems in your Gemfile, which may resolve the conflict.
diff --git a/spec/install/gems/resolving_spec.rb b/spec/install/gems/resolving_spec.rb
index 7ef2535e57..5377db233e 100644
--- a/spec/install/gems/resolving_spec.rb
+++ b/spec/install/gems/resolving_spec.rb
@@ -96,7 +96,8 @@ describe "bundle install with gem sources" do
             bundle :install, :env => { "DEBUG_RESOLVER_TREE" => "1" }
           end
 
-          expect(resolve_output).to include(" net_b (>= 0) ruby")
+          expect(resolve_output).to include(" net_b")
+          expect(resolve_output).to include(" net_build_extensions (1.0)")
         end
       end
     end
diff --git a/spec/install/gems/sources_spec.rb b/spec/install/gems/sources_spec.rb
index bf302d8d9e..0206dc1dbf 100644
--- a/spec/install/gems/sources_spec.rb
+++ b/spec/install/gems/sources_spec.rb
@@ -280,7 +280,7 @@ describe "bundle install with gems on multiple sources" do
 
       it "does not install the gem" do
         bundle :install
-        expect(out).to include("Could not find gem 'not_in_repo1 (>= 0) ruby'")
+        expect(out).to include("Could not find gem 'not_in_repo1'")
       end
     end
 
diff --git a/spec/install/post_bundle_message_spec.rb b/spec/install/post_bundle_message_spec.rb
index 1c7847ce50..39076461db 100644
--- a/spec/install/post_bundle_message_spec.rb
+++ b/spec/install/post_bundle_message_spec.rb
@@ -89,7 +89,7 @@ describe "post bundle message" do
           gem "rack"
           gem "not-a-gem", :group => :development
         G
-        expect(out).to include("Could not find gem 'not-a-gem (>= 0) ruby' in any of the gem sources listed in your Gemfile or available on this machine.")
+        expect(out).to include("Could not find gem 'not-a-gem' in any of the gem sources listed in your Gemfile or available on this machine.")
       end
     end
   end