Some railties cleanup:

	* Rename <framework>/rails.rb -> <framework>/railtie.rb
	* Rails::Plugin -> Rails::Railtie
	* Rails::Plugin::Vendored -> Rails::Plugin

3 files changed, 4 insertions, 0 deletions

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 = []