diff options
| author | Xavier Noria <fxn@hashref.com> | 2013-03-25 02:24:12 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2013-03-25 02:24:12 -0700 |
| commit | 8caafd9076c565a30bbab16959ba018545e12a00 (patch) | |
| tree | 56b74611c01d7c069d907605282eb454c227d9e8 /railties | |
| parent | 3b2a2419469d7116d30f46fa801abe1b29d7dc24 (diff) | |
| parent | 6a499cd97ff4ac12b76c435643bfa9b3ba02c1ac (diff) | |
| download | rails-8caafd9076c565a30bbab16959ba018545e12a00.tar.gz rails-8caafd9076c565a30bbab16959ba018545e12a00.tar.bz2 rails-8caafd9076c565a30bbab16959ba018545e12a00.zip | |
Merge pull request #9914 from prathamesh-sonpatki/controller-pluralize
Controller name pluralized
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/application/assets_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb index 638df8ca23..e0cbe73fc4 100644 --- a/railties/test/application/assets_test.rb +++ b/railties/test/application/assets_test.rb @@ -86,8 +86,8 @@ module ApplicationTests def test_precompile_does_not_hit_the_database app_file "app/assets/javascripts/application.js", "alert();" app_file "app/assets/javascripts/foo/application.js", "alert();" - app_file "app/controllers/user_controller.rb", <<-eoruby - class UserController < ApplicationController; end + app_file "app/controllers/users_controller.rb", <<-eoruby + class UsersController < ApplicationController; end eoruby app_file "app/models/user.rb", <<-eoruby class User < ActiveRecord::Base; end |