diff options
| -rw-r--r-- | railties/lib/generators/rails/app/app_generator.rb | 2 | ||||
| -rw-r--r-- | railties/lib/generators/rails/app/templates/Gemfile | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/railties/lib/generators/rails/app/app_generator.rb b/railties/lib/generators/rails/app/app_generator.rb index 918bb98db8..dcb8af208f 100644 --- a/railties/lib/generators/rails/app/app_generator.rb +++ b/railties/lib/generators/rails/app/app_generator.rb @@ -181,7 +181,7 @@ module Rails::Generators end def bundle_if_dev_or_edge - run "gem bundle" if dev_or_edge? + run "bundle install" if dev_or_edge? end protected diff --git a/railties/lib/generators/rails/app/templates/Gemfile b/railties/lib/generators/rails/app/templates/Gemfile index 50f1a6a414..ce495177eb 100644 --- a/railties/lib/generators/rails/app/templates/Gemfile +++ b/railties/lib/generators/rails/app/templates/Gemfile @@ -7,7 +7,7 @@ gem "rails", "<%= Rails::VERSION::STRING %>" ## Bundle edge rails: <%- if options.dev? -%> -directory "<%= Rails::Generators::RAILS_DEV_PATH %>", :glob => "{*/,}*.gemspec" +path "<%= Rails::Generators::RAILS_DEV_PATH %>", :glob => "{*/,}*.gemspec" gem "rails", "<%= Rails::VERSION::STRING %>" <%- else -%> <%= "# " unless options.edge? %>gem "rails", :git => "git://github.com/rails/rails.git" 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)}$/ |