aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-17 16:44:15 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-17 16:44:15 -0200
commit916731686ba2b48abf96251639fdb8b8af63814c (patch)
treeeb6cc8bf809ada83c791f0251252f17e553ccbc2 /railties/lib/rails/generators
parent27a181f7518616b5b508e17271145e330d948cd2 (diff)
downloadrails-916731686ba2b48abf96251639fdb8b8af63814c.tar.gz
rails-916731686ba2b48abf96251639fdb8b8af63814c.tar.bz2
rails-916731686ba2b48abf96251639fdb8b8af63814c.zip
Generate new applications with the right rails-dom-testing version
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/app_base.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index b651623b53..5f8c33c713 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -195,9 +195,11 @@ module Rails
def rails_gemfile_entry
if options.dev?
- [GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH)]
+ [GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH),
+ GemfileEntry.github('rails-dom-testing', 'rails/rails-dom-testing')]
elsif options.edge?
- [GemfileEntry.github('rails', 'rails/rails')]
+ [GemfileEntry.github('rails', 'rails/rails'),
+ GemfileEntry.github('rails-dom-testing', 'rails/rails-dom-testing')]
else
[GemfileEntry.version('rails',
Rails::VERSION::STRING,