From 97296b11e2c4011ea5522c4de0153f7ffa6a47ae Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Thu, 15 Oct 2009 14:50:02 -0700
Subject: Have config/application.rb contain the application definition and
 require that file instead of config/boot.rb or config/environment.rb in
 script/*.

---
 railties/test/generators/actions_test.rb       | 10 +++++-----
 railties/test/generators/app_generator_test.rb |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'railties/test/generators')

diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index f226e184d1..adc61f6d8a 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -57,7 +57,7 @@ class ActionsTest < GeneratorsTestCase
   def test_gem_should_put_gem_dependency_in_enviroment
     run_generator
     action :gem, 'will-paginate'
-    assert_file 'config/environment.rb', /config\.gem 'will\-paginate'/
+    assert_file 'config/application.rb', /config\.gem 'will\-paginate'/
   end
 
   def test_gem_with_options_should_include_options_in_gem_dependency_in_environment
@@ -65,7 +65,7 @@ class ActionsTest < GeneratorsTestCase
     action :gem, 'mislav-will-paginate', :lib => 'will-paginate', :source => 'http://gems.github.com'
 
     regexp = /#{Regexp.escape("config.gem 'mislav-will-paginate', :lib => 'will-paginate', :source => 'http://gems.github.com'")}/
-    assert_file 'config/environment.rb', regexp
+    assert_file 'config/application.rb', regexp
   end
 
   def test_gem_with_env_string_should_put_gem_dependency_in_specified_environment
@@ -84,14 +84,14 @@ class ActionsTest < GeneratorsTestCase
   def test_gem_with_lib_option_set_to_false_should_put_gem_dependency_in_enviroment_correctly
     run_generator
     action :gem, 'mislav-will-paginate', :lib => false
-    assert_file 'config/environment.rb', /config\.gem 'mislav\-will\-paginate'\, :lib => false/
+    assert_file 'config/application.rb', /config\.gem 'mislav\-will\-paginate'\, :lib => false/
   end
 
   def test_environment_should_include_data_in_environment_initializer_block
     run_generator
     load_paths = 'config.load_paths += %w["#{RAILS_ROOT}/app/extras"]'
     action :environment, load_paths
-    assert_file 'config/environment.rb', /#{Regexp.escape(load_paths)}/
+    assert_file 'config/application.rb', /#{Regexp.escape(load_paths)}/
   end
 
   def test_environment_with_block_should_include_block_contents_in_environment_initializer_block
@@ -102,7 +102,7 @@ class ActionsTest < GeneratorsTestCase
       '# This will be added'
     end
 
-    assert_file 'config/environment.rb' do |content|
+    assert_file 'config/application.rb' do |content|
       assert_match /# This will be added/, content
       assert_no_match /# This wont be added/, content
     end
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 6e46c4ddc0..5d6a9f6de9 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -65,7 +65,7 @@ class AppGeneratorTest < GeneratorsTestCase
 
   def test_activerecord_is_removed_from_frameworks_if_skip_activerecord_is_given
     run_generator ["--skip-activerecord"]
-    assert_file "config/environment.rb", /config\.frameworks \-= \[ :active_record \]/
+    assert_file "config/application.rb", /config\.frameworks \-= \[ :active_record \]/
   end
 
   def test_prototype_and_test_unit_are_added_by_default
-- 
cgit v1.2.3