diff options
author | Samuel E. Giddins <segiddins@segiddins.me> | 2015-07-26 22:16:20 -0700 |
---|---|---|
committer | Samuel E. Giddins <segiddins@segiddins.me> | 2015-07-26 22:16:20 -0700 |
commit | 210f9d9f8fd1644e3ca099473af335dcd920a7ff (patch) | |
tree | fefa31580e04c9bfe130afacad5e7632aa6325b5 | |
parent | 58ce165aa37d11f6fa8f9400684f68f907eece45 (diff) | |
download | bundler-210f9d9f8fd1644e3ca099473af335dcd920a7ff.tar.gz |
[Resolver] Re-enable spec since it's no longer super slow
-rw-r--r-- | spec/install/gems/flex_spec.rb | 77 |
1 files changed, 38 insertions, 39 deletions
diff --git a/spec/install/gems/flex_spec.rb b/spec/install/gems/flex_spec.rb index 4881d06180..8b344cd8ad 100644 --- a/spec/install/gems/flex_spec.rb +++ b/spec/install/gems/flex_spec.rb @@ -277,43 +277,42 @@ describe "bundle flex_install" do end end - # This was written to test github issue #636, but it passed. - # It's insanoly slow (3.36s) so I'm not going to run it - # describe "when a locked child dependency conflicts" do - # before(:each) do - # build_repo2 do - # build_gem "capybara", "0.3.9" do |s| - # s.add_dependency "rack", ">= 1.0.0" - # end - # - # build_gem "rack", "1.1.0" - # build_gem "rails", "3.0.0.rc4" do |s| - # s.add_dependency "rack", "~> 1.1.0" - # end - # - # build_gem "rack", "1.2.1" - # build_gem "rails", "3.0.0" do |s| - # s.add_dependency "rack", "~> 1.2.1" - # end - # end - # end - # - # it "prints the correct error message" do - # # install Rails 3.0.0.rc - # install_gemfile <<-G - # source "file://#{gem_repo2}" - # gem "rails", "3.0.0.rc4" - # gem "capybara", "0.3.9" - # G - # - # # upgrade Rails to 3.0.0 and then install again - # install_gemfile <<-G - # source "file://#{gem_repo2}" - # gem "rails", "3.0.0" - # gem "capybara", "0.3.9" - # G - # - # out.should match(/Gemfile.lock/) - # end - # end + # This was written to test github issue #636 + describe "when a locked child dependency conflicts" do + before(:each) do + build_repo2 do + build_gem "capybara", "0.3.9" do |s| + s.add_dependency "rack", ">= 1.0.0" + end + + build_gem "rack", "1.1.0" + build_gem "rails", "3.0.0.rc4" do |s| + s.add_dependency "rack", "~> 1.1.0" + end + + build_gem "rack", "1.2.1" + build_gem "rails", "3.0.0" do |s| + s.add_dependency "rack", "~> 1.2.1" + end + end + end + + it "prints the correct error message" do + # install Rails 3.0.0.rc + install_gemfile <<-G + source "file://#{gem_repo2}" + gem "rails", "3.0.0.rc4" + gem "capybara", "0.3.9" + G + + # upgrade Rails to 3.0.0 and then install again + install_gemfile <<-G + source "file://#{gem_repo2}" + gem "rails", "3.0.0" + gem "capybara", "0.3.9" + G + + expect(out).to include("Gemfile.lock") + end + end end |