aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-08 10:25:29 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-08 10:25:29 -0700
commitd1136e6ad0aab44cfc0626c553b3ee82479f6196 (patch)
tree756926accb05b6d8268d1d425d33b4b7a35d230b /railties/lib/rails
parent523820f81b057d102e3c0d0de2fb03a1c7333174 (diff)
parent5fa87281ece411393cb167f03b1deda014a82593 (diff)
downloadrails-d1136e6ad0aab44cfc0626c553b3ee82479f6196.tar.gz
rails-d1136e6ad0aab44cfc0626c553b3ee82479f6196.tar.bz2
rails-d1136e6ad0aab44cfc0626c553b3ee82479f6196.zip
Merge pull request #6681 from arunagw/plugin_gen_fix
Plugin gen fix
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/plugin_new/templates/Rakefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
index 743036362e..1369140537 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
@@ -14,7 +14,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
rdoc.rdoc_files.include('lib/**/*.rb')
end
-<% if full? && !options[:skip_active_record] -%>
+<% if full? && !options[:skip_active_record] && !options[:skip_test_unit] -%>
APP_RAKEFILE = File.expand_path("../<%= dummy_path -%>/Rakefile", __FILE__)
load 'rails/tasks/engine.rake'
<% end %>