aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/tasks/framework.rake2
-rw-r--r--railties/test/application/rake/templates_test.rb32
2 files changed, 33 insertions, 1 deletions
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index e669315934..94e8f83e86 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -10,7 +10,7 @@ namespace :rails do
require 'rails/generators'
require 'rails/generators/rails/app/app_generator'
generator = Rails::Generators::AppGenerator.new [Rails.root], {}, destination_root: Rails.root
- generator.apply template, verbose: false
+ generator.send :apply, template, verbose: false
end
namespace :templates do
diff --git a/railties/test/application/rake/templates_test.rb b/railties/test/application/rake/templates_test.rb
new file mode 100644
index 0000000000..1fca80debd
--- /dev/null
+++ b/railties/test/application/rake/templates_test.rb
@@ -0,0 +1,32 @@
+require "isolation/abstract_unit"
+
+module ApplicationTests
+ module RakeTests
+ class TemplatesTest < ActiveSupport::TestCase
+ include ActiveSupport::Testing::Isolation
+
+ def setup
+ build_app
+ require "rails/all"
+ super
+ end
+
+ def teardown
+ super
+ teardown_app
+ end
+
+ def test_rake_template
+ Dir.chdir(app_path) do
+ cmd = "bundle exec rake rails:template LOCATION=foo"
+ r,w = IO.pipe
+ Process.waitpid Process.spawn(cmd, out: w, err: w)
+ w.close
+ assert_match(/Could not find.*foo/, r.read)
+ r.close
+ end
+ end
+ end
+ end
+end
+