Ticket #10583: add_query_methods_to_RAILS_ENV.diff

railties/test/initializer_test.rb

@@ -216 +216 @@
-  end
-  
-end  
+
+uses_mocha "add query methods for environments to RAILS_ENV" do
+  class InitializerRailsEnvTests < Test::Unit::TestCase
+  
+    def test_development_for_RAILS_ENV_when_test
+      Dir.expects(:[]).returns ["development"]
+      load File.dirname(__FILE__) + "/../lib/initializer.rb"
+      assert_equal true, RAILS_ENV.development?
+    end
+  
+    def test_test_for_RAILS_ENV_when_test
+      Dir.expects(:[]).returns ["test"]
+      load File.dirname(__FILE__) + "/../lib/initializer.rb"
+      assert_equal false, RAILS_ENV.test?
+    end
+  
+  end
+end

railties/lib/initializer.rb

@@ -8 +8 @@
-require 'rails/plugin/locator'
-require 'rails/plugin/loader'
-
-
-RAILS_ENV = (ENV['RAILS_ENV'] || 'development').dup unless defined?(RAILS_ENV)
+# moved to another file so test_help.rb can also share the logic
+load File.dirname(__FILE__) + "/add_query_methods_to_RAILS_ENV.rb"
-
-module Rails
-  # The Initializer is responsible for processing the Rails configuration, such

railties/lib/test_help.rb

@@ -3 +3 @@
-# Make double-sure the RAILS_ENV is set to test,
-# so fixtures are loaded to the right database
-silence_warnings { RAILS_ENV = "test" }
+load File.dirname(__FILE__) + "/add_query_methods_to_RAILS_ENV.rb"
-
-require 'test/unit'
-require 'active_support/test_case'

railties/lib/add_query_methods_to_RAILS_ENV.rb

@@ +1 @@
+class << RAILS_ENV
+  Dir["#{RAILS_ROOT}/config/environments/*"].collect do |file|
+    File.basename(file, ".rb")
+  end.each do |environment|
+    define_method :"#{environment}?" do
+      self == environment
+    end
+  end
+end