aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2010-02-02 11:24:19 +1100
committerMikel Lindsaar <raasdnil@gmail.com>2010-02-02 11:24:19 +1100
commit485f12fe4cbf4ae9d22454a6a02c786ef10514f7 (patch)
treee0fce1cbce6b8de43ba9c8948f554058e24a2350 /railties/test
parentd1eed079e1338249aa3b2881d07029ac4e71f4ed (diff)
downloadrails-485f12fe4cbf4ae9d22454a6a02c786ef10514f7.tar.gz
rails-485f12fe4cbf4ae9d22454a6a02c786ef10514f7.tar.bz2
rails-485f12fe4cbf4ae9d22454a6a02c786ef10514f7.zip
Fixed --dev flag for new bundler
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/app_generator_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index f821f5caf3..95a33c50f8 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -168,15 +168,15 @@ class AppGeneratorTest < Rails::Generators::TestCase
end
def test_dev_option
- generator([destination_root], :dev => true).expects(:run).with("gem bundle")
+ generator([destination_root], :dev => true).expects(:run).with("bundle install")
silence(:stdout){ generator.invoke }
rails_path = File.expand_path('../../..', Rails.root)
- dev_gem = %(directory #{rails_path.inspect}, :glob => "{*/,}*.gemspec")
+ dev_gem = %(path #{rails_path.inspect}, :glob => "{*/,}*.gemspec")
assert_file 'Gemfile', /^#{Regexp.escape(dev_gem)}$/
end
def test_edge_option
- generator([destination_root], :edge => true).expects(:run).with("gem bundle")
+ generator([destination_root], :edge => true).expects(:run).with("bundle install")
silence(:stdout){ generator.invoke }
edge_gem = %(gem "rails", :git => "git://github.com/rails/rails.git")
assert_file 'Gemfile', /^#{Regexp.escape(edge_gem)}$/