8 files changed, 10 insertions, 44 deletions
diff --git a/actionpack/test/controller/addresses_render_test.rb b/actionpack/test/controller/addresses_render_test.rb
deleted file mode 100644
index 07f27fd362..0000000000
--- a/actionpack/test/controller/addresses_render_test.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'abstract_unit'
-require 'active_support/logger'
-require 'controller/fake_controllers'
-
-class Address
-  class << self
-    def count(conditions = nil, join = nil)
-      nil
-    end
-
-    def find_all(arg1, arg2, arg3, arg4)
-      []
-    end
-
-    def find(*args)
-      []
-    end
-  end
-end
-
-class AddressesTest < ActionController::TestCase
-  tests AddressesController
-
-  def setup
-    super
-    # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
-    # a more accurate simulation of what happens in "real life".
-    @controller.logger = ActiveSupport::Logger.new(nil)
-
-    @request.host = "www.nextangle.com"
-  end
-
-  def test_list
-    get :list
-    assert_equal "We only need to get this far!", @response.body.chomp
-  end
-end
diff --git a/actionpack/test/fixtures/addresses/list.erb b/actionpack/test/fixtures/addresses/list.erb
deleted file mode 100644
index c75e01eece..0000000000
--- a/actionpack/test/fixtures/addresses/list.erb
+++ /dev/null
@@ -1 +0,0 @@
-We only need to get this far!
diff --git a/actionpack/test/lib/controller/fake_controllers.rb b/actionpack/test/lib/controller/fake_controllers.rb
index a5364bb01c..1a2863b689 100644
--- a/actionpack/test/lib/controller/fake_controllers.rb
+++ b/actionpack/test/lib/controller/fake_controllers.rb
@@ -14,7 +14,6 @@ module Api
 end
 
 class AccountController < ActionController::Base; end
-class AddressesController < ActionController::Base; end
 class ArchiveController < ActionController::Base; end
 class ArticlesController < ActionController::Base; end
 class BarController < ActionController::Base; end
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index 901aaa5f72..3ac2a76b96 100644
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -8,6 +8,7 @@ require 'models/computer'
 require 'models/topic'
 require 'models/company'
 require 'models/category'
+require 'models/reply'
 require 'models/contact'
 require 'models/keyboard'
 
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index 20c1a17cef..562b370c97 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -16,6 +16,7 @@ require 'models/parrot'
 require 'models/pirate'
 require 'models/post'
 require 'models/randomly_named_c1'
+require 'models/reply'
 require 'models/ship'
 require 'models/task'
 require 'models/topic'
diff --git a/activerecord/test/cases/identity_map_test.rb b/activerecord/test/cases/identity_map_test.rb
index 3d2aee3809..3efc8bf559 100644
--- a/activerecord/test/cases/identity_map_test.rb
+++ b/activerecord/test/cases/identity_map_test.rb
@@ -1,8 +1,10 @@
 require "cases/helper"
+
 require 'models/developer'
 require 'models/project'
 require 'models/company'
 require 'models/topic'
+require 'models/reply'
 require 'models/computer'
 require 'models/customer'
 require 'models/order'
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index cd787e40c6..e17ba76437 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -2,6 +2,7 @@ require "cases/helper"
 require 'models/post'
 require 'models/topic'
 require 'models/comment'
+require 'models/reply'
 require 'models/author'
 require 'models/developer'
 
diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index 4b7c36f839..c630bd21b1 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -92,9 +92,9 @@ module ActiveSupport
     #   "author_id"       # => "Author"
     def humanize(lower_case_and_underscored_word)
       result = lower_case_and_underscored_word.to_s.dup
-      inflections.humans.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
+      inflections.humans.each { |(rule, replacement)| break if result.sub!(rule, replacement) }
       result.gsub!(/_id$/, "")
-      result.gsub!(/_/, ' ')
+      result.tr!('_', ' ')
       result.gsub(/([a-z\d]*)/i) { |match|
         "#{inflections.acronyms[match] || match.downcase}"
       }.gsub(/^\w/) { $&.upcase }
@@ -146,7 +146,7 @@ module ActiveSupport
     # Example:
     #   "puni_puni" # => "puni-puni"
     def dasherize(underscored_word)
-      underscored_word.gsub(/_/, '-')
+      underscored_word.tr('_', '-')
     end
 
     # Removes the module part from the expression in the string:
@@ -308,10 +308,10 @@ module ActiveSupport
     def apply_inflections(word, rules)
       result = word.to_s.dup
 
-      if word.empty? || inflections.uncountables.any? { |inflection| result =~ /\b#{inflection}\Z/i }
+      if word.empty? || inflections.uncountables.include?(result.downcase[/\b\w+\Z/])
         result
       else
-        rules.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
+        rules.each { |(rule, replacement)| break if result.sub!(rule, replacement) }
         result
       end
     end