diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-12-29 20:09:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-29 20:09:43 +0100 |
| commit | ca3eb2c1569a86e9c7eee2e9877dd773797a76b4 (patch) | |
| tree | 016b5f2247d6ad4d95f1b1f05c897b5472abb7bf /railties/lib/rails/generators/test_unit | |
| parent | 654704247eba742e139cfaa8d1385f13605d9e12 (diff) | |
| parent | c491bf012948383632e53f874c552041a6e23b36 (diff) | |
| download | rails-ca3eb2c1569a86e9c7eee2e9877dd773797a76b4.tar.gz rails-ca3eb2c1569a86e9c7eee2e9877dd773797a76b4.tar.bz2 rails-ca3eb2c1569a86e9c7eee2e9877dd773797a76b4.zip | |
Merge branch 'master' into fix_26964
Diffstat (limited to 'railties/lib/rails/generators/test_unit')
| -rw-r--r-- | railties/lib/rails/generators/test_unit/generator/generator_generator.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/test_unit/generator/generator_generator.rb b/railties/lib/rails/generators/test_unit/generator/generator_generator.rb index 59f8d40343..6b6e094453 100644 --- a/railties/lib/rails/generators/test_unit/generator/generator_generator.rb +++ b/railties/lib/rails/generators/test_unit/generator/generator_generator.rb @@ -12,7 +12,7 @@ module TestUnit # :nodoc: template "generator_test.rb", File.join("test/lib/generators", class_path, "#{file_name}_generator_test.rb") end - protected + private def generator_path if options[:namespace] diff --git a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb index 806279788e..67bff8e4f9 100644 --- a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb +++ b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb @@ -17,7 +17,7 @@ module TestUnit # :nodoc: template "preview.rb", File.join("test/mailers/previews", class_path, "#{file_name}_mailer_preview.rb") end - protected + private def file_name @_file_name ||= super.gsub(/_mailer/i, "") end |