From ae7ada1fde1648a5c81b9e6adf74d515e0bbe0a5 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Thu, 31 Dec 2009 13:11:54 -0800
Subject: Some railties cleanup:

	* Rename <framework>/rails.rb -> <framework>/railtie.rb
	* Rails::Plugin -> Rails::Railtie
	* Rails::Plugin::Vendored -> Rails::Plugin
---
 railties/test/application/configuration_test.rb | 1 +
 railties/test/application/initializer_test.rb   | 2 ++
 railties/test/application/notifications_test.rb | 1 +
 3 files changed, 4 insertions(+)

(limited to 'railties/test/application')

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 1f04eb9f75..adb867ca6d 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -16,6 +16,7 @@ module ApplicationTests
       FileUtils.rm_rf(new_app) if File.directory?(new_app)
       build_app
       boot_rails
+      FileUtils.rm_rf("#{app_path}/config/environments")
     end
 
     test "the application root is set correctly" do
diff --git a/railties/test/application/initializer_test.rb b/railties/test/application/initializer_test.rb
index e03f9ffb00..3fd0b0e5df 100644
--- a/railties/test/application/initializer_test.rb
+++ b/railties/test/application/initializer_test.rb
@@ -7,6 +7,7 @@ module ApplicationTests
     def setup
       build_app
       boot_rails
+      FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
     test "initializing an application adds the application paths to the load path" do
@@ -160,6 +161,7 @@ module ApplicationTests
     def setup
       build_app
       boot_rails
+      FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
     test "database middleware doesn't initialize when activerecord is not in frameworks" do
diff --git a/railties/test/application/notifications_test.rb b/railties/test/application/notifications_test.rb
index 8229e83147..b57e829cca 100644
--- a/railties/test/application/notifications_test.rb
+++ b/railties/test/application/notifications_test.rb
@@ -18,6 +18,7 @@ module ApplicationTests
     def setup
       build_app
       boot_rails
+      FileUtils.rm_rf("#{app_path}/config/environments")
       require "active_support/notifications"
       @events = []
 
-- 
cgit v1.2.3