Merge branch '1-7-stable'

Conflicts:
	CHANGELOG.md

1 files changed, 35 insertions, 0 deletions

diff --git a/spec/realworld/edgecases_spec.rb b/spec/realworld/edgecases_spec.rb
index 263ac520b3..000ded4fd0 100644
--- a/spec/realworld/edgecases_spec.rb
+++ b/spec/realworld/edgecases_spec.rb
@@ -35,6 +35,41 @@ describe "real world edgecases", :realworld => true do
     expect(out).to include("activemodel 3.0.5")
   end
 
+  it "resolves dependencies correctly", :ruby => "1.9" do
+    install_gemfile <<-G
+    source "https://rubygems.org"
+
+    gem 'rails', '~> 3.0'
+    gem 'capybara', '~> 2.2.0'
+    G
+    expect(out).to include("rails 3.2.21")
+    expect(out).to include("capybara 2.2.1")
+  end
+
+  it "installs the latest version of gxapi_rails", :ruby => "1.9"  do
+    install_gemfile <<-G
+    source "https://rubygems.org"
+
+    gem "sass-rails"
+    gem "rails", "~> 3"
+    gem "gxapi_rails"
+    G
+    expect(out).to include("gxapi_rails 0.0.6")
+  end
+
+  it "installs the latest version of i18n" do
+    install_gemfile <<-G
+    source "https://rubygems.org"
+
+    gem "i18n", "~> 0.4"
+    gem "activesupport", "~> 3.0"
+    gem "activerecord", "~> 3.0"
+    gem "builder", "~> 2.1.2"
+    G
+    expect(out).to include("i18n 0.6.11")
+    expect(out).to include("activesupport 3.0.5")
+  end
+
   # https://github.com/bundler/bundler/issues/1500
   it "does not fail install because of gem plugins" do
     realworld_system_gems("open_gem --version 1.4.2", "rake --version 0.9.2")