aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/testing
diff options
context:
space:
mode:
authorAndrew Mutz <andrew.mutz@gmail.com>2012-05-28 20:09:54 -0700
committerAndrew Mutz <andrew.mutz@gmail.com>2012-05-28 21:09:20 -0700
commit598f8bdda139b606bdba70225a2e74e42cb9687c (patch)
tree64986793ef19d865070c92bdb1409141f39d4033 /activesupport/lib/active_support/testing
parent3d4ede2959e04b4d6e4c932947ea99758b6d73cd (diff)
downloadrails-598f8bdda139b606bdba70225a2e74e42cb9687c.tar.gz
rails-598f8bdda139b606bdba70225a2e74e42cb9687c.tar.bz2
rails-598f8bdda139b606bdba70225a2e74e42cb9687c.zip
decoupling activesupport performance testing from actionview and adding tests
Diffstat (limited to 'activesupport/lib/active_support/testing')
-rw-r--r--activesupport/lib/active_support/testing/performance.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index 2bea0f991a..517926c74d 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -3,7 +3,8 @@ require 'rails/version'
require 'active_support/concern'
require 'active_support/core_ext/class/delegating_attributes'
require 'active_support/core_ext/string/inflections'
-require 'action_view/helpers/number_helper'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/number_helper'
module ActiveSupport
module Testing
@@ -195,8 +196,7 @@ module ActiveSupport
end
class Base
- include ActionView::Helpers::NumberHelper
- include ActionView::Helpers::OutputSafetyHelper
+ include ActiveSupport::NumberHelper
attr_reader :total
@@ -240,7 +240,7 @@ module ActiveSupport
class Amount < Base
def format(measurement)
- number_with_delimiter(measurement.floor)
+ number_to_delimited(measurement.floor)
end
end