Merge pull request #1449 from engineyard/1-0-stable

Make tests green again (result of small changes to output format)

4 files changed, 10 insertions, 10 deletions

diff --git a/spec/install/gems/flex_spec.rb b/spec/install/gems/flex_spec.rb
index c48b7b6302..8fad4ba565 100644
--- a/spec/install/gems/flex_spec.rb
+++ b/spec/install/gems/flex_spec.rb
@@ -199,8 +199,8 @@ describe "bundle flex_install" do
             rack (0.9.1)
 
           In Gemfile:
-            rack-obama (= 2.0) depends on
-              rack (= 1.2)
+            rack-obama (= 2.0) ruby depends on
+              rack (= 1.2) ruby
 
         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/simple_case_spec.rb b/spec/install/gems/simple_case_spec.rb
index 7838623321..fa7ec5adbf 100644
--- a/spec/install/gems/simple_case_spec.rb
+++ b/spec/install/gems/simple_case_spec.rb
@@ -636,7 +636,7 @@ describe "bundle install with gem sources" do
         Fetching source index for file:#{gem_repo2}/
         Bundler could not find compatible versions for gem "bundler":
           In Gemfile:
-            bundler (= 0.9.2)
+            bundler (= 0.9.2) ruby
 
           Current Bundler version:
             bundler (#{Bundler::VERSION})
@@ -693,10 +693,10 @@ describe "bundle install with gem sources" do
         Fetching source index for file:#{gem_repo2}/
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
-            activemerchant depends on
-              activesupport (>= 2.0.0)
+            activemerchant (>= 0) ruby depends on
+              activesupport (>= 2.0.0) ruby
 
-            rails_fail depends on
+            rails_fail (>= 0) ruby depends on
               activesupport (1.2.3)
       E
       out.should == nice_error
@@ -713,8 +713,8 @@ describe "bundle install with gem sources" do
         Fetching source index for file:#{gem_repo2}/
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
-            rails_fail depends on
-              activesupport (= 1.2.3)
+            rails_fail (>= 0) ruby depends on
+              activesupport (= 1.2.3) ruby
 
             activesupport (2.3.5)
       E
diff --git a/spec/install/git_spec.rb b/spec/install/git_spec.rb
index da2e886e78..117c47426b 100644
--- a/spec/install/git_spec.rb
+++ b/spec/install/git_spec.rb
@@ -403,7 +403,7 @@ describe "bundle install with git sources" do
         gem "has_submodule"
       end
     G
-    out.should =~ /could not find gem 'submodule'/i
+    out.should =~ /could not find gem 'submodule/i
 
     should_not_be_installed "has_submodule 1.0", :expect_err => true
   end
diff --git a/spec/runtime/setup_spec.rb b/spec/runtime/setup_spec.rb
index 34a2c5df13..63c820ddea 100644
--- a/spec/runtime/setup_spec.rb
+++ b/spec/runtime/setup_spec.rb
@@ -450,7 +450,7 @@ describe "Bundler.setup" do
           end
         R
 
-        out.should == "You have already activated thin 1.1, but your Gemfile requires thin 1.0. Consider using bundle exec."
+        out.should == "You have already activated thin 1.1, but your Gemfile requires thin 1.0. Using bundle exec may solve this."
       end
 
       it "version_requirement is now deprecated in rubygems 1.4.0+" do