aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/test_unit/controller
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-10-09 17:41:00 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-10-09 17:41:00 -0700
commit1c534c6e429b6d5115153a8e83ae13e55d0ee1d3 (patch)
tree632bf64b5a6974c2e47d5300ff8d15a143133af5 /railties/lib/rails/generators/test_unit/controller
parent0787cea3bb5e6f2c216e71090732bc55ee03c7dc (diff)
parent2a68f68aead9fd65ecac8062ca8efc15f5bab418 (diff)
downloadrails-1c534c6e429b6d5115153a8e83ae13e55d0ee1d3.tar.gz
rails-1c534c6e429b6d5115153a8e83ae13e55d0ee1d3.tar.bz2
rails-1c534c6e429b6d5115153a8e83ae13e55d0ee1d3.zip
Merge pull request #7878 from blowmage/test_locations
Update test names and locations
Diffstat (limited to 'railties/lib/rails/generators/test_unit/controller')
-rw-r--r--railties/lib/rails/generators/test_unit/controller/controller_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/test_unit/controller/controller_generator.rb b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb
index 20f3bd8965..db99e55e9e 100644
--- a/railties/lib/rails/generators/test_unit/controller/controller_generator.rb
+++ b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb
@@ -8,7 +8,7 @@ module TestUnit
def create_test_files
template 'functional_test.rb',
- File.join('test/functional', class_path, "#{file_name}_controller_test.rb")
+ File.join('test/controllers', class_path, "#{file_name}_controller_test.rb")
end
end
end