summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2010-02-25 09:04:28 -0800
committerAndre Arko <andre@arko.net>2010-02-25 09:04:28 -0800
commite35a538da495c5c7cf4b2fb87d508066c4bf7bf2 (patch)
tree7f1cec59aa9bed81af3b4371e7bdb451356a2a7a
parent73df27c1ca532a2c6885ccfc704fcfd062c8279d (diff)
downloadbundler-e35a538da495c5c7cf4b2fb87d508066c4bf7bf2.tar.gz
Remove pending from passing spec, un-nest unrelated spec
-rw-r--r--spec/runtime/setup_spec.rb31
1 files changed, 15 insertions, 16 deletions
diff --git a/spec/runtime/setup_spec.rb b/spec/runtime/setup_spec.rb
index 89e62eb9b6..e91579852c 100644
--- a/spec/runtime/setup_spec.rb
+++ b/spec/runtime/setup_spec.rb
@@ -71,7 +71,6 @@ describe "Bundler.setup" do
describe "with paths" do
it "activates the gems in the path source" do
- pending
system_gems "rack-1.0.0"
build_lib "rack", "1.0.0" do |s|
@@ -154,24 +153,24 @@ describe "Bundler.setup" do
should_not_be_installed "activesupport 2.3.2", :groups => :rack
should_be_installed "rack 1.0.0", :groups => :rack
end
+ end
- # Rubygems returns loaded_from as a string
- it "has loaded_from as a string on all specs" do
- build_git "foo"
+ # Rubygems returns loaded_from as a string
+ it "has loaded_from as a string on all specs" do
+ build_git "foo"
- install_gemfile <<-G
- source "file://#{gem_repo1}"
- gem "rack"
- gem "foo", :git => "#{lib_path('foo-1.0')}"
- G
+ install_gemfile <<-G
+ source "file://#{gem_repo1}"
+ gem "rack"
+ gem "foo", :git => "#{lib_path('foo-1.0')}"
+ G
- run <<-R
- Gem.loaded_specs.each do |n, s|
- puts "FAIL" unless String === s.loaded_from
- end
- R
+ run <<-R
+ Gem.loaded_specs.each do |n, s|
+ puts "FAIL" unless String === s.loaded_from
+ end
+ R
- out.should be_empty
- end
+ out.should be_empty
end
end