From 1e41097294b6f966f65909db5c56c9fc21b665f7 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Thu, 31 Dec 2009 10:36:24 -0800
Subject: Fully remove config.frameworks in favor of requires in boot.rb

---
 railties/test/application/configuration_test.rb | 3 ++-
 railties/test/application/initializer_test.rb   | 4 ++--
 railties/test/generators/app_generator_test.rb  | 9 +++++----
 railties/test/initializer/path_test.rb          | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index ece41f9de8..a7df1e09ab 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -75,10 +75,11 @@ module ApplicationTests
     test "the application can be marked as threadsafe when there are no frameworks" do
       FileUtils.rm_rf("#{app_path}/config/environments")
       add_to_config <<-RUBY
-        config.frameworks = []
         config.threadsafe!
       RUBY
 
+      use_frameworks []
+
       assert_nothing_raised do
         require "#{app_path}/config/application"
       end
diff --git a/railties/test/application/initializer_test.rb b/railties/test/application/initializer_test.rb
index 42fc416faa..e03f9ffb00 100644
--- a/railties/test/application/initializer_test.rb
+++ b/railties/test/application/initializer_test.rb
@@ -7,7 +7,6 @@ module ApplicationTests
     def setup
       build_app
       boot_rails
-      require "rails"
     end
 
     test "initializing an application adds the application paths to the load path" do
@@ -51,8 +50,9 @@ module ApplicationTests
       assert_nothing_raised NameError do
         add_to_config <<-RUBY
           config.root = "#{app_path}"
-          config.frameworks = []
         RUBY
+
+        use_frameworks []
         require "#{app_path}/config/environment"
       end
     end
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 567555fdc5..2cba42551e 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -63,10 +63,11 @@ class AppGeneratorTest < GeneratorsTestCase
     assert_no_file "config/database.yml"
   end
 
-  def test_activerecord_is_removed_from_frameworks_if_skip_activerecord_is_given
-    run_generator ["--skip-activerecord"]
-    assert_file "config/application.rb", /config\.frameworks \-= \[ :active_record \]/
-  end
+  # TODO: Bring this back using requires
+  # def test_activerecord_is_removed_from_frameworks_if_skip_activerecord_is_given
+  #   run_generator ["--skip-activerecord"]
+  #   assert_file "config/application.rb", /config\.frameworks \-= \[ :active_record \]/
+  # end
 
   def test_prototype_and_test_unit_are_added_by_default
     run_generator
diff --git a/railties/test/initializer/path_test.rb b/railties/test/initializer/path_test.rb
index 3bbf9617a0..73d1b1a125 100644
--- a/railties/test/initializer/path_test.rb
+++ b/railties/test/initializer/path_test.rb
@@ -7,14 +7,14 @@ module InitializerTests
     def setup
       build_app
       boot_rails
-      require "rails"
       add_to_config <<-RUBY
         config.root = "#{app_path}"
-        config.frameworks = [:action_controller, :action_view, :action_mailer, :active_record]
         config.after_initialize do
           ActionController::Base.session_store = nil
         end
       RUBY
+      use_frameworks [:action_controller, :action_view, :action_mailer, :active_record]
+      require "rails"
       require "#{app_path}/config/environment"
       @paths = Rails.application.config.paths
     end
-- 
cgit v1.2.3