diff options
author | Carlhuda <carlhuda@engineyard.com> | 2010-04-20 17:51:12 -0700 |
---|---|---|
committer | Carlhuda <carlhuda@engineyard.com> | 2010-04-20 17:51:12 -0700 |
commit | ba579f4a3e525fdd78d89531291450b26a009b07 (patch) | |
tree | cd0a51cbbfb2bb6038535d52c2702fb5e60845fa /spec | |
parent | 4bfff00e3bfc24c92c2a4e24ed08ad4e40942db2 (diff) | |
download | bundler-ba579f4a3e525fdd78d89531291450b26a009b07.tar.gz |
Remove temporary flex stuff
Diffstat (limited to 'spec')
-rw-r--r-- | spec/install/gems/flex_spec.rb | 3 | ||||
-rw-r--r-- | spec/support/helpers.rb | 6 | ||||
-rw-r--r-- | spec/unit/parser_spec.rb | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/spec/install/gems/flex_spec.rb b/spec/install/gems/flex_spec.rb index ac2e51fb..effeff5d 100644 --- a/spec/install/gems/flex_spec.rb +++ b/spec/install/gems/flex_spec.rb @@ -25,7 +25,7 @@ describe "bundle flex_install" do gem 'rack', '1.0' G - bundle :flex_install + bundle :install should_be_installed "rack 1.0.0" should_be_locked end @@ -118,6 +118,7 @@ describe "bundle flex_install" do end it "rebuilds env.rb correctly" do + pending build_repo2 flex_install_gemfile <<-G source "file://#{gem_repo2}" diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb index ce9df3be..b5df5c04 100644 --- a/spec/support/helpers.rb +++ b/spec/support/helpers.rb @@ -119,11 +119,7 @@ module Spec bundle :install, opts end - def flex_install_gemfile(*args) - gemfile(*args) - opts = args.last.is_a?(Hash) ? args.last : {} - bundle :flex_install, opts - end + alias flex_install_gemfile install_gemfile def install_gems(*gems) gems.each do |g| diff --git a/spec/unit/parser_spec.rb b/spec/unit/parser_spec.rb index ef9332d0..6efd0a2c 100644 --- a/spec/unit/parser_spec.rb +++ b/spec/unit/parser_spec.rb @@ -12,7 +12,7 @@ describe "lockfile parser" do def locked lockfile = File.read(bundled_app('Gemfile.lock')) - Bundler::Flex::LockfileParser.new(lockfile) + Bundler::LockfileParser.new(lockfile) end it "has the source in it" do |