Merge branch 'master' of git@github.com:rails/rails

2 files changed, 5 insertions, 27 deletions

diff --git a/railties/lib/console_with_helpers.rb b/railties/lib/console_with_helpers.rb
index f9e8bf9cbf..039db667c4 100644
--- a/railties/lib/console_with_helpers.rb
+++ b/railties/lib/console_with_helpers.rb
@@ -1,24 +1,5 @@
-class Module
-  def include_all_modules_from(parent_module)
-    parent_module.constants.each do |const|
-      mod = parent_module.const_get(const)
-      if mod.class == Module
-        send(:include, mod)
-        include_all_modules_from(mod)
-      end
-    end
-  end
-end
-
-def helper(*helper_names)
-  returning @helper_proxy ||= Object.new do |helper|
-    helper_names.each { |h| helper.extend "#{h}_helper".classify.constantize }
-  end
-end
-
-class << helper 
-  include_all_modules_from ActionView
+def helper
+  @helper ||= ApplicationController.helpers
 end
 
 @controller = ApplicationController.new
-helper :application rescue nil
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index e1ce32da65..516ab8523e 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -3,18 +3,15 @@ $:.unshift File.dirname(__FILE__) + "/../../actionpack/lib"
 $:.unshift File.dirname(__FILE__) + "/../lib"
 $:.unshift File.dirname(__FILE__) + "/../builtin/rails_info"
 
+require 'rubygems'
 require 'test/unit'
+gem 'mocha', '>= 0.9.3'
+require 'mocha'
 require 'stringio'
 require 'active_support'
 
-# Wrap tests that use Mocha and skip if unavailable.
 def uses_mocha(test_name)
-  require 'rubygems'
-  gem 'mocha', '>= 0.5.5'
-  require 'mocha'
   yield
-rescue LoadError
-  $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again."
 end
 
 if defined?(RAILS_ROOT)