aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/test_unit/performance/performance_generator.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2012-10-15 10:20:50 -0500
committerJoshua Peek <josh@joshpeek.com>2012-10-15 10:20:50 -0500
commitc800e27ad35ec46f32b5ac4428e5cf7141f95105 (patch)
tree0821e0afaba2a74dec6ea1397ee3cabfd3d10c59 /railties/lib/rails/generators/test_unit/performance/performance_generator.rb
parent7dba1599d9092a8362956a3fab23b2c60eedea63 (diff)
parent46dc6e7786222865309d15a9eaaaf55e3b7d9c1f (diff)
downloadrails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.tar.gz
rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.tar.bz2
rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.zip
Merge branch 'master' into asset-path-helper
Conflicts: railties/test/application/configuration_test.rb
Diffstat (limited to 'railties/lib/rails/generators/test_unit/performance/performance_generator.rb')
-rw-r--r--railties/lib/rails/generators/test_unit/performance/performance_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/test_unit/performance/performance_generator.rb b/railties/lib/rails/generators/test_unit/performance/performance_generator.rb
index 9a80d1ea54..5552edeee4 100644
--- a/railties/lib/rails/generators/test_unit/performance/performance_generator.rb
+++ b/railties/lib/rails/generators/test_unit/performance/performance_generator.rb
@@ -3,7 +3,7 @@ require 'rails/generators/test_unit'
module TestUnit # :nodoc:
module Generators # :nodoc:
class PerformanceGenerator < Base # :nodoc:
- check_class_collision :suffix => "Test"
+ check_class_collision suffix: "Test"
def create_test_files
template 'performance_test.rb', File.join('test/performance', class_path, "#{file_name}_test.rb")