Revert benchmark helper regression. Use a #capture within a #benchmark

block. Breaks benchmark calls that return non-String values otherwise.

Revert "add benchmark helper that works in erb"

This reverts commit 904e544cc8f5846de7c31827bb5556c6a238c0de.

Conflicts:
	actionpack/lib/action_view/helpers.rb
	actionpack/lib/action_view/helpers/benchmark_helper.rb
	actionpack/test/template/benchmark_helper_test.rb

3 files changed, 3 insertions, 39 deletions

diff --git a/actionpack/lib/action_view/helpers.rb b/actionpack/lib/action_view/helpers.rb
index 269e78a021..8a78685ae1 100644
--- a/actionpack/lib/action_view/helpers.rb
+++ b/actionpack/lib/action_view/helpers.rb
@@ -1,3 +1,5 @@
+require 'active_support/benchmarkable'
+
 module ActionView #:nodoc:
   module Helpers #:nodoc:
     extend ActiveSupport::Autoload
@@ -6,7 +8,6 @@ module ActionView #:nodoc:
     autoload :AssetTagHelper
     autoload :AssetUrlHelper
     autoload :AtomFeedHelper
-    autoload :BenchmarkHelper
     autoload :CacheHelper
     autoload :CaptureHelper
     autoload :ControllerHelper
@@ -29,11 +30,11 @@ module ActionView #:nodoc:
 
     extend ActiveSupport::Concern
 
+    include ActiveSupport::Benchmarkable
     include ActiveModelHelper
     include AssetTagHelper
     include AssetUrlHelper
     include AtomFeedHelper
-    include BenchmarkHelper
     include CacheHelper
     include CaptureHelper
     include ControllerHelper
diff --git a/actionpack/lib/action_view/helpers/benchmark_helper.rb b/actionpack/lib/action_view/helpers/benchmark_helper.rb
deleted file mode 100644
index 87fbf8f1a8..0000000000
--- a/actionpack/lib/action_view/helpers/benchmark_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'active_support/benchmarkable'
-
-module ActionView
-  module Helpers
-    module BenchmarkHelper #:nodoc:
-      include ActiveSupport::Benchmarkable
-
-      def benchmark(*)
-        capture { super }
-      end
-    end
-  end
-end
diff --git a/actionpack/test/template/benchmark_helper_test.rb b/actionpack/test/template/benchmark_helper_test.rb
deleted file mode 100644
index 8c198d2562..0000000000
--- a/actionpack/test/template/benchmark_helper_test.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'abstract_unit'
-require 'stringio'
-
-class BenchmarkHelperTest < ActionView::TestCase
-  include RenderERBUtils
-  tests ActionView::Helpers::BenchmarkHelper
-
-  def test_output_in_erb
-    output   = render_erb("Hello <%= benchmark do %>world<% end %>")
-    expected = 'Hello world'
-    assert_equal expected, output
-  end
-
-  def test_returns_value_from_block
-    assert_equal 'test', benchmark { 'test' }
-  end
-
-  def test_default_message
-    log = StringIO.new
-    self.stubs(:logger).returns(Logger.new(log))
-    benchmark {}
-    assert_match(/Benchmarking \(\d+.\d+ms\)/, log.rewind && log.read)
-  end
-end