Permalink
Browse files

Respect different ruby platforms and versions. Rub lotion on brittle …

…tests.

Conflicts:

	lib/bundler/bundle.rb
	lib/bundler/environment.rb
	spec/bundler/cli_spec.rb
	spec/bundler/installer_spec.rb
	spec/bundler/manifest_file_spec.rb
  • Loading branch information...
1 parent f71521e commit d550ee1815b34ab9492f2815b3943681c6f3c0c9 @jeremy jeremy committed with Yehuda Katz Jan 1, 2010
Showing with 0 additions and 10 deletions.
  1. +0 −10 spec/bundler/cli_spec.rb
View
10 spec/bundler/cli_spec.rb
@@ -91,16 +91,6 @@
@manifest.gem_path.join('../../environment.rb').file?.should == true
end
- it "adds existing bin directories to the load path" do
- load_paths = run_in_context("require 'rake'; puts $:").split("\n")
- load_paths.should include(@manifest.gem_path.join('gems/rake-0.8.7/bin').to_s)
- end
-
- it "doesn't add non-existant bin directories to the load path'" do
- load_paths = run_in_context("require 'activesupport'; puts $:").split("\n")
- load_paths.should_not include(@manifest.gem_path.join('gems/activesupport-2.3.2/bin').to_s)
- end
-
it "creates valid executables in ./bin" do
app_root do
`bin/rake`.should == "0.8.7\n"

0 comments on commit d550ee1

Please sign in to comment.