diff options
Diffstat (limited to 'railties')
-rw-r--r-- | railties/CHANGELOG | 2 | ||||
-rw-r--r-- | railties/builtin/rails_info/rails/info.rb | 4 | ||||
-rw-r--r-- | railties/doc/README_FOR_APP | 2 | ||||
-rw-r--r-- | railties/test/rails_info_test.rb | 7 |
4 files changed, 12 insertions, 3 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index c942ed6ca4..0fdaafa672 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Add ActiveResource to Rails::Info. Closes #8741 [kampers] + * use Gem.find_name instead of search when freezing gems. Prevent false positives for other gems with rails in the name. Closes #8729 [wselman] * Automatically generate add/remove column commands in specially named migrations like AddLocationToEvent. Closes #9006 [zenspider] diff --git a/railties/builtin/rails_info/rails/info.rb b/railties/builtin/rails_info/rails/info.rb index 89c2ce6eee..0895dd2d7f 100644 --- a/railties/builtin/rails_info/rails/info.rb +++ b/railties/builtin/rails_info/rails/info.rb @@ -19,7 +19,7 @@ module Rails end def components - %w( active_record action_pack action_web_service action_mailer active_support ) + %w( active_record action_pack action_web_service active_resource action_mailer active_support ) end def component_version(component) @@ -89,7 +89,7 @@ module Rails end # Versions of each Rails component (Active Record, Action Pack, - # Action Web Service, Action Mailer, and Active Support). + # Action Web Service, Active Resource, Action Mailer, and Active Support). components.each do |component| property "#{component.titlecase} version" do component_version(component) diff --git a/railties/doc/README_FOR_APP b/railties/doc/README_FOR_APP index 82c7eeba28..af0cc2cccf 100644 --- a/railties/doc/README_FOR_APP +++ b/railties/doc/README_FOR_APP @@ -1,2 +1,2 @@ Use this README file to introduce your application and point to useful places in the API for learning more. -Run "rake doc:app" to generate API documentation for your models and controllers.
\ No newline at end of file +Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries.
\ No newline at end of file diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb index 33ff25b8c0..a212046586 100644 --- a/railties/test/rails_info_test.rb +++ b/railties/test/rails_info_test.rb @@ -70,6 +70,13 @@ EOS def test_component_version assert_property 'Active Support version', ActiveSupport::VERSION::STRING end + + def test_components_exist + Rails::Info.components.each do |component| + dir = File.dirname(__FILE__) + "/../../" + component.gsub('_', '') + assert File.directory?(dir), "#{component.classify} does not exist" + end + end protected def svn_info=(info) |