diff options
author | Piotr Sarnacki <drogus@gmail.com> | 2012-04-01 01:12:49 +0200 |
---|---|---|
committer | Piotr Sarnacki <drogus@gmail.com> | 2012-04-02 00:30:42 +0200 |
commit | 515e1d33f25a75dee0726dab67a1469f5a4ce813 (patch) | |
tree | 1f6dd1fd2f2922830cf706c1743095c0700a5f9d /railties/test/generators | |
parent | 27fc6ec95eb7a1756fb86693b6fe8e03f1d66ef3 (diff) | |
download | rails-515e1d33f25a75dee0726dab67a1469f5a4ce813.tar.gz rails-515e1d33f25a75dee0726dab67a1469f5a4ce813.tar.bz2 rails-515e1d33f25a75dee0726dab67a1469f5a4ce813.zip |
Usage file in generators shouldn't be fetched only based on source_root
In case `source_roout` is not set, `default_source_root` is used,
which includes also `templates` directory. If there is no `templates`
directory, `default_source_root` is not available and USAGE will not
be displayed. USAGE should be also checked based on default
directory excluding `templates`.
Diffstat (limited to 'railties/test/generators')
-rw-r--r-- | railties/test/generators/app_generator_test.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/migration_generator_test.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 37703d9376..f1e760c52f 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -316,7 +316,7 @@ class AppGeneratorTest < Rails::Generators::TestCase end def test_default_usage - File.expects(:exist?).returns(false) + Rails::Generators::AppGenerator.expects(:usage_path).returns(nil) assert_match(/Create rails files for app generator/, Rails::Generators::AppGenerator.desc) end diff --git a/railties/test/generators/migration_generator_test.rb b/railties/test/generators/migration_generator_test.rb index 16e4ac0881..a89631d022 100644 --- a/railties/test/generators/migration_generator_test.rb +++ b/railties/test/generators/migration_generator_test.rb @@ -157,4 +157,8 @@ class MigrationGeneratorTest < Rails::Generators::TestCase end end end + + def test_properly_identifies_usage_file + assert generator_class.send(:usage_path) + end end |