Pull in the custom configuration concept from dhh/custom_configuration

2 files changed, 52 insertions, 0 deletions

diff --git a/railties/test/application/configuration/base_test.rb b/railties/test/application/configuration/base_test.rb
new file mode 100644
index 0000000000..d6a82b139d
--- /dev/null
+++ b/railties/test/application/configuration/base_test.rb
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 0000000000..045537fc28
--- /dev/null
+++ b/railties/test/application/configuration/custom_test.rb
@@ -0,0 +1,15 @@
+require 'application/configuration/base_test'
+
+class ApplicationTests::ConfigurationTests::CustomTest < ApplicationTests::ConfigurationTests::BaseTest
+  test 'access custom configuration point' do
+    add_to_config <<-RUBY
+      config.x.resque.inline_jobs = :always
+      config.x.resque.timeout     = 60
+    RUBY
+    require_environment
+
+    assert_equal :always, Rails.configuration.x.resque.inline_jobs
+    assert_equal 60, Rails.configuration.x.resque.timeout
+    assert_nil Rails.configuration.x.resque.nothing
+  end
+end