1 files changed, 47 insertions, 4 deletions
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index 597746c4aa..51fa2fe16f 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -102,11 +102,32 @@ class ActionsTest < Rails::Generators::TestCase
     assert_file 'Gemfile', /gem "rspec-rails"$/
   end
 
+  def test_gem_group_should_wrap_gems_in_a_group
+    run_generator
+
+    action :gem_group, :development, :test do
+      gem 'rspec-rails'
+    end
+
+    action :gem_group, :test do
+      gem 'fakeweb'
+    end
+
+    assert_file 'Gemfile', /\ngroup :development, :test do\n  gem "rspec-rails"\nend\n\ngroup :test do\n  gem "fakeweb"\nend/
+  end
+
   def test_environment_should_include_data_in_environment_initializer_block
     run_generator
     autoload_paths = 'config.autoload_paths += %w["#{Rails.root}/app/extras"]'
     action :environment, autoload_paths
-    assert_file 'config/application.rb', /#{Regexp.escape(autoload_paths)}/
+    assert_file 'config/application.rb', /  class Application < Rails::Application\n    #{Regexp.escape(autoload_paths)}/
+  end
+
+  def test_environment_should_include_data_in_environment_initializer_block_with_env_option
+    run_generator
+    autoload_paths = 'config.autoload_paths += %w["#{Rails.root}/app/extras"]'
+    action :environment, autoload_paths, :env => 'development'
+    assert_file "config/environments/development.rb", /Application\.configure do\n  #{Regexp.escape(autoload_paths)}/
   end
 
   def test_environment_with_block_should_include_block_contents_in_environment_initializer_block
@@ -158,9 +179,12 @@ class ActionsTest < Rails::Generators::TestCase
     action :generate, 'model', 'MyModel'
   end
 
-  def test_rake_should_run_rake_command_with_development_env
-    generator.expects(:run).once.with('rake log:clear RAILS_ENV=development', :verbose => false)
+  def test_rake_should_run_rake_command_with_default_env
+    generator.expects(:run).once.with("rake log:clear RAILS_ENV=development", :verbose => false)
+    old_env, ENV['RAILS_ENV'] = ENV["RAILS_ENV"], nil
     action :rake, 'log:clear'
+  ensure
+    ENV["RAILS_ENV"] = old_env
   end
 
   def test_rake_with_env_option_should_run_rake_command_in_env
@@ -168,9 +192,28 @@ class ActionsTest < Rails::Generators::TestCase
     action :rake, 'log:clear', :env => 'production'
   end
 
+  def test_rake_with_rails_env_variable_should_run_rake_command_in_env
+    generator.expects(:run).once.with('rake log:clear RAILS_ENV=production', :verbose => false)
+    old_env, ENV["RAILS_ENV"] = ENV["RAILS_ENV"], "production"
+    action :rake, 'log:clear'
+  ensure
+    ENV["RAILS_ENV"] = old_env
+  end
+
+  def test_env_option_should_win_over_rails_env_variable_when_running_rake
+    generator.expects(:run).once.with('rake log:clear RAILS_ENV=production', :verbose => false)
+    old_env, ENV["RAILS_ENV"] = ENV["RAILS_ENV"], "staging"
+    action :rake, 'log:clear', :env => 'production'
+  ensure
+    ENV["RAILS_ENV"] = old_env
+  end
+
   def test_rake_with_sudo_option_should_run_rake_command_with_sudo
-    generator.expects(:run).once.with('sudo rake log:clear RAILS_ENV=development', :verbose => false)
+    generator.expects(:run).once.with("sudo rake log:clear RAILS_ENV=development", :verbose => false)
+    old_env, ENV['RAILS_ENV'] = ENV["RAILS_ENV"], nil
     action :rake, 'log:clear', :sudo => true
+  ensure
+    ENV["RAILS_ENV"] = old_env
   end
 
   def test_capify_should_run_the_capify_command