Remove unneeded base file

We are only using for one test class

2 files changed, 53 insertions, 57 deletions

diff --git a/railties/test/application/configuration/base_test.rb b/railties/test/application/configuration/base_test.rb
deleted file mode 100644
index d6a82b139d..0000000000
--- a/railties/test/application/configuration/base_test.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'isolation/abstract_unit'
-require 'rack/test'
-require 'env_helpers'
-
-module ApplicationTests
-  module ConfigurationTests
-    class BaseTest < ActiveSupport::TestCase
-      def setup
-        build_app
-        boot_rails
-        FileUtils.rm_rf("#{app_path}/config/environments")
-      end
-
-      def teardown
-        teardown_app
-        FileUtils.rm_rf(new_app) if File.directory?(new_app)
-      end
-
-      private
-        def new_app
-          File.expand_path("#{app_path}/../new_app")
-        end
-
-        def copy_app
-          FileUtils.cp_r(app_path, new_app)
-        end
-
-        def app
-          @app ||= Rails.application
-        end
-
-        def require_environment
-          require "#{app_path}/config/environment"  
-        end
-    end
-  end
-end
\ No newline at end of file
diff --git a/railties/test/application/configuration/custom_test.rb b/railties/test/application/configuration/custom_test.rb
index f8d22f6d97..f5c99d030e 100644
--- a/railties/test/application/configuration/custom_test.rb
+++ b/railties/test/application/configuration/custom_test.rb
@@ -1,22 +1,55 @@
-require 'application/configuration/base_test'
-
-class ApplicationTests::ConfigurationTests::CustomTest < ApplicationTests::ConfigurationTests::BaseTest
-  test 'access custom configuration point' do
-    add_to_config <<-RUBY
-      config.x.payment_processing.schedule = :daily
-      config.x.payment_processing.retries  = 3
-      config.x.super_debugger              = true
-      config.x.hyper_debugger              = false
-      config.x.nil_debugger                = nil
-    RUBY
-    require_environment
-
-    x = Rails.configuration.x
-    assert_equal :daily, x.payment_processing.schedule
-    assert_equal 3, x.payment_processing.retries
-    assert_equal true, x.super_debugger
-    assert_equal false, x.hyper_debugger
-    assert_equal nil, x.nil_debugger
-    assert_nil x.i_do_not_exist.zomg
+require 'isolation/abstract_unit'
+require 'env_helpers'
+
+module ApplicationTests
+  module ConfigurationTests
+    class CustomTest < ActiveSupport::TestCase
+      def setup
+        build_app
+        boot_rails
+        FileUtils.rm_rf("#{app_path}/config/environments")
+      end
+
+      def teardown
+        teardown_app
+        FileUtils.rm_rf(new_app) if File.directory?(new_app)
+      end
+
+      test 'access custom configuration point' do
+        add_to_config <<-RUBY
+          config.x.payment_processing.schedule = :daily
+          config.x.payment_processing.retries  = 3
+          config.x.super_debugger              = true
+          config.x.hyper_debugger              = false
+          config.x.nil_debugger                = nil
+        RUBY
+        require_environment
+
+        x = Rails.configuration.x
+        assert_equal :daily, x.payment_processing.schedule
+        assert_equal 3, x.payment_processing.retries
+        assert_equal true, x.super_debugger
+        assert_equal false, x.hyper_debugger
+        assert_equal nil, x.nil_debugger
+        assert_nil x.i_do_not_exist.zomg
+      end
+
+      private
+        def new_app
+          File.expand_path("#{app_path}/../new_app")
+        end
+
+        def copy_app
+          FileUtils.cp_r(app_path, new_app)
+        end
+
+        def app
+          @app ||= Rails.application
+        end
+
+        def require_environment
+          require "#{app_path}/config/environment"
+        end
+    end
   end
 end