mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #19751 from y-yagi/fix_indent_of_controller 

fix indent in routes when using namespaced controllers
This commit is contained in:
Andrew White 2015-04-14 08:45:18 +01:00
parent 524d40591e d2be2a9166
commit 4fb3a55528
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
railties/lib/rails/generators/rails/controller/controller_generator.rb
View File

@ -13,7 +13,8 @@ module Rails
def add_routes
unless options[:skip_routes]
actions.reverse_each do |action|
route generate_routing_code(action)
# route prepends two spaces onto the front of the string that is passed, this corrects that.
route generate_routing_code(action)[2..-1]
end
end
end
@ -36,12 +37,12 @@ module Rails
# namespace :foo do
# namespace :bar do
namespace_ladder = regular_class_path.each_with_index.map do |ns, i|
indent("namespace :#{ns} do\n", i * 2)
indent(" namespace :#{ns} do\n", i * 2)
end.join
# Create route
# get 'baz/index'
route = indent(%{get '#{file_name}/#{action}'\n}, depth * 2)
route = indent(%{ get '#{file_name}/#{action}'\n}, depth * 2)
# Create `end` ladder
# end

4
railties/test/generators/controller_generator_test.rb
View File

@ -96,6 +96,8 @@ class ControllerGeneratorTest < Rails::Generators::TestCase
def test_namespaced_routes_are_created_in_routes
run_generator ["admin/dashboard", "index"]
assert_file "config/routes.rb", /namespace :admin do\n\s+get 'dashboard\/index'\n/
assert_file "config/routes.rb" do |route|
assert_match(/^ namespace :admin do\n get 'dashboard\/index'\n end$/, route)
end
end
end