diff options
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 4 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 29 |
2 files changed, 31 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index a5743762e5..8512b1ca4a 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -165,7 +165,7 @@ module Rails end def gem_for_ruby_debugger - if RUBY_VERSION < "1.9.2" + if RUBY_VERSION < "1.9" "gem 'ruby-debug'" else "gem 'ruby-debug19', :require => 'ruby-debug'" @@ -173,7 +173,7 @@ module Rails end def gem_for_turn - unless RUBY_VERSION < "1.9.2" + unless RUBY_VERSION < "1.9.2" || options[:skip_test_unit] <<-GEMFILE.strip_heredoc group :test do # Pretty printed test output diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 9e1d47cd2f..80d9732343 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -202,6 +202,35 @@ class AppGeneratorTest < Rails::Generators::TestCase end end + def test_inclusion_of_turn_gem_in_gemfile + run_generator + assert_file "Gemfile" do |contents| + assert_match /gem 'turn'/, contents unless RUBY_VERSION < '1.9.2' + assert_no_match /gem 'turn'/, contents if RUBY_VERSION < '1.9.2' + end + end + + def test_turn_gem_is_not_included_in_gemfile_if_skipping_test_unit + run_generator [destination_root, "--skip-test-unit"] + assert_file "Gemfile" do |contents| + assert_no_match /gem 'tuarn'/, contents unless RUBY_VERSION < '1.9.2' + end + end + + def test_inclusion_of_ruby_debug + run_generator + assert_file "Gemfile" do |contents| + assert_match /gem 'ruby-debug'/, contents if RUBY_VERSION < '1.9' + end + end + + def test_inclusion_of_ruby_debug19_if_ruby19 + run_generator + assert_file "Gemfile" do |contents| + assert_match /gem 'ruby-debug19', :require => 'ruby-debug'/, contents unless RUBY_VERSION < '1.9' + end + end + def test_template_from_dir_pwd FileUtils.cd(Rails.root) assert_match /It works from file!/, run_generator([destination_root, "-m", "lib/template.rb"]) |