RubyGems - actionpack - Versions diffs - 2.2.3 → 2.3.2 - Mend

actionpack 2.2.3 → 2.3.2

Potentially problematic release.

This version of actionpack might be problematic. Click here for more details.

Files changed (264) hide show

data/CHANGELOG +433 -375
data/MIT-LICENSE +1 -1
data/README +21 -75
data/Rakefile +1 -1
data/lib/action_controller.rb +80 -43
data/lib/action_controller/assertions/model_assertions.rb +1 -0
data/lib/action_controller/assertions/response_assertions.rb +43 -16
data/lib/action_controller/assertions/routing_assertions.rb +1 -1
data/lib/action_controller/assertions/selector_assertions.rb +17 -12
data/lib/action_controller/assertions/tag_assertions.rb +1 -4
data/lib/action_controller/base.rb +153 -82
data/lib/action_controller/benchmarking.rb +9 -9
data/lib/action_controller/caching.rb +9 -11
data/lib/action_controller/caching/actions.rb +11 -18
data/lib/action_controller/caching/fragments.rb +28 -20
data/lib/action_controller/caching/pages.rb +13 -15
data/lib/action_controller/caching/sweeping.rb +2 -2
data/lib/action_controller/cgi_ext.rb +0 -1
data/lib/action_controller/cgi_ext/cookie.rb +2 -0
data/lib/action_controller/cgi_process.rb +54 -162
data/lib/action_controller/cookies.rb +13 -25
data/lib/action_controller/dispatcher.rb +43 -122
data/lib/action_controller/failsafe.rb +52 -0
data/lib/action_controller/flash.rb +38 -47
data/lib/action_controller/helpers.rb +13 -9
data/lib/action_controller/http_authentication.rb +203 -23
data/lib/action_controller/integration.rb +126 -70
data/lib/action_controller/layout.rb +36 -39
data/lib/action_controller/middleware_stack.rb +119 -0
data/lib/action_controller/middlewares.rb +13 -0
data/lib/action_controller/mime_responds.rb +19 -4
data/lib/action_controller/mime_type.rb +8 -0
data/lib/action_controller/params_parser.rb +71 -0
data/lib/action_controller/performance_test.rb +0 -1
data/lib/action_controller/polymorphic_routes.rb +36 -30
data/lib/action_controller/reloader.rb +14 -0
data/lib/action_controller/request.rb +107 -499
data/lib/action_controller/request_forgery_protection.rb +7 -39
data/lib/action_controller/rescue.rb +55 -35
data/lib/action_controller/resources.rb +34 -31
data/lib/action_controller/response.rb +99 -57
data/lib/action_controller/rewindable_input.rb +28 -0
data/lib/action_controller/routing.rb +7 -7
data/lib/action_controller/routing/builder.rb +4 -1
data/lib/action_controller/routing/optimisations.rb +1 -1
data/lib/action_controller/routing/recognition_optimisation.rb +1 -2
data/lib/action_controller/routing/route.rb +15 -5
data/lib/action_controller/routing/route_set.rb +82 -35
data/lib/action_controller/routing/segments.rb +35 -0
data/lib/action_controller/session/abstract_store.rb +181 -0
data/lib/action_controller/session/cookie_store.rb +197 -175
data/lib/action_controller/session/mem_cache_store.rb +36 -83
data/lib/action_controller/session_management.rb +26 -134
data/lib/action_controller/streaming.rb +24 -7
data/lib/action_controller/templates/rescues/diagnostics.erb +2 -2
data/lib/action_controller/templates/rescues/template_error.erb +2 -2
data/lib/action_controller/test_case.rb +87 -30
data/lib/action_controller/test_process.rb +145 -104
data/lib/action_controller/uploaded_file.rb +44 -0
data/lib/action_controller/url_rewriter.rb +3 -6
data/lib/action_controller/vendor/html-scanner.rb +16 -0
data/lib/action_controller/vendor/html-scanner/html/selector.rb +1 -1
data/lib/action_controller/vendor/rack-1.0/rack.rb +89 -0
data/lib/action_controller/vendor/rack-1.0/rack/adapter/camping.rb +22 -0
data/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/handler.rb +37 -0
data/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/request.rb +37 -0
data/lib/action_controller/vendor/rack-1.0/rack/auth/basic.rb +58 -0
data/lib/action_controller/vendor/rack-1.0/rack/auth/digest/md5.rb +124 -0
data/lib/action_controller/vendor/rack-1.0/rack/auth/digest/nonce.rb +51 -0
data/lib/action_controller/vendor/rack-1.0/rack/auth/digest/params.rb +55 -0
data/lib/action_controller/vendor/rack-1.0/rack/auth/digest/request.rb +40 -0
data/lib/action_controller/vendor/rack-1.0/rack/auth/openid.rb +480 -0
data/lib/action_controller/vendor/rack-1.0/rack/builder.rb +63 -0
data/lib/action_controller/vendor/rack-1.0/rack/cascade.rb +36 -0
data/lib/action_controller/vendor/rack-1.0/rack/chunked.rb +49 -0
data/lib/action_controller/vendor/rack-1.0/rack/commonlogger.rb +61 -0
data/lib/action_controller/vendor/rack-1.0/rack/conditionalget.rb +45 -0
data/lib/action_controller/vendor/rack-1.0/rack/content_length.rb +29 -0
data/lib/action_controller/vendor/rack-1.0/rack/content_type.rb +23 -0
data/lib/action_controller/vendor/rack-1.0/rack/deflater.rb +85 -0
data/lib/action_controller/vendor/rack-1.0/rack/directory.rb +153 -0
data/lib/action_controller/vendor/rack-1.0/rack/file.rb +88 -0
data/lib/action_controller/vendor/rack-1.0/rack/handler.rb +48 -0
data/lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb +61 -0
data/lib/action_controller/vendor/rack-1.0/rack/handler/evented_mongrel.rb +8 -0
data/lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb +89 -0
data/lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb +55 -0
data/lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb +84 -0
data/lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb +59 -0
data/lib/action_controller/vendor/rack-1.0/rack/handler/swiftiplied_mongrel.rb +8 -0
data/lib/action_controller/vendor/rack-1.0/rack/handler/thin.rb +18 -0
data/lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb +67 -0
data/lib/action_controller/vendor/rack-1.0/rack/head.rb +19 -0
data/lib/action_controller/vendor/rack-1.0/rack/lint.rb +462 -0
data/lib/action_controller/vendor/rack-1.0/rack/lobster.rb +65 -0
data/lib/action_controller/vendor/rack-1.0/rack/lock.rb +16 -0
data/lib/action_controller/vendor/rack-1.0/rack/methodoverride.rb +27 -0
data/lib/action_controller/vendor/rack-1.0/rack/mime.rb +204 -0
data/lib/action_controller/vendor/rack-1.0/rack/mock.rb +160 -0
data/lib/action_controller/vendor/rack-1.0/rack/recursive.rb +57 -0
data/lib/action_controller/vendor/rack-1.0/rack/reloader.rb +64 -0
data/lib/action_controller/vendor/rack-1.0/rack/request.rb +241 -0
data/lib/action_controller/vendor/rack-1.0/rack/response.rb +179 -0
data/lib/action_controller/vendor/rack-1.0/rack/session/abstract/id.rb +142 -0
data/lib/action_controller/vendor/rack-1.0/rack/session/cookie.rb +91 -0
data/lib/action_controller/vendor/rack-1.0/rack/session/memcache.rb +109 -0
data/lib/action_controller/vendor/rack-1.0/rack/session/pool.rb +100 -0
data/lib/action_controller/vendor/rack-1.0/rack/showexceptions.rb +349 -0
data/lib/action_controller/vendor/rack-1.0/rack/showstatus.rb +106 -0
data/lib/action_controller/vendor/rack-1.0/rack/static.rb +38 -0
data/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb +55 -0
data/lib/action_controller/vendor/rack-1.0/rack/utils.rb +392 -0
data/lib/action_controller/verification.rb +1 -1
data/lib/action_pack.rb +1 -1
data/lib/action_pack/version.rb +2 -2
data/lib/action_view.rb +22 -17
data/lib/action_view/base.rb +53 -79
data/lib/action_view/erb/util.rb +38 -0
data/lib/action_view/helpers.rb +24 -5
data/lib/action_view/helpers/active_record_helper.rb +2 -2
data/lib/action_view/helpers/asset_tag_helper.rb +81 -50
data/lib/action_view/helpers/atom_feed_helper.rb +1 -1
data/lib/action_view/helpers/benchmark_helper.rb +26 -5
data/lib/action_view/helpers/date_helper.rb +82 -7
data/lib/action_view/helpers/form_helper.rb +295 -64
data/lib/action_view/helpers/form_options_helper.rb +160 -18
data/lib/action_view/helpers/form_tag_helper.rb +2 -2
data/lib/action_view/helpers/number_helper.rb +31 -18
data/lib/action_view/helpers/prototype_helper.rb +2 -12
data/lib/action_view/helpers/sanitize_helper.rb +0 -10
data/lib/action_view/helpers/scriptaculous_helper.rb +1 -0
data/lib/action_view/helpers/tag_helper.rb +3 -4
data/lib/action_view/helpers/text_helper.rb +99 -122
data/lib/action_view/helpers/translation_helper.rb +19 -1
data/lib/action_view/helpers/url_helper.rb +25 -2
data/lib/action_view/inline_template.rb +1 -1
data/lib/action_view/locale/en.yml +19 -1
data/lib/action_view/partials.rb +46 -9
data/lib/action_view/paths.rb +28 -84
data/lib/action_view/reloadable_template.rb +117 -0
data/lib/action_view/renderable.rb +28 -35
data/lib/action_view/renderable_partial.rb +3 -4
data/lib/action_view/template.rb +172 -31
data/lib/action_view/template_error.rb +8 -9
data/lib/action_view/template_handler.rb +1 -1
data/lib/action_view/template_handlers.rb +9 -6
data/lib/action_view/template_handlers/erb.rb +2 -39
data/lib/action_view/template_handlers/rjs.rb +1 -0
data/lib/action_view/test_case.rb +27 -1
data/test/abstract_unit.rb +23 -17
data/test/active_record_unit.rb +5 -4
data/test/activerecord/active_record_store_test.rb +139 -106
data/test/activerecord/render_partial_with_record_identification_test.rb +5 -21
data/test/controller/action_pack_assertions_test.rb +25 -23
data/test/controller/addresses_render_test.rb +3 -6
data/test/controller/assert_select_test.rb +83 -70
data/test/controller/base_test.rb +11 -13
data/test/controller/benchmark_test.rb +3 -3
data/test/controller/caching_test.rb +34 -24
data/test/controller/capture_test.rb +3 -6
data/test/controller/content_type_test.rb +3 -6
data/test/controller/cookie_test.rb +31 -66
data/test/controller/deprecation/deprecated_base_methods_test.rb +9 -11
data/test/controller/dispatcher_test.rb +23 -28
data/test/controller/fake_models.rb +8 -0
data/test/controller/filters_test.rb +6 -2
data/test/controller/flash_test.rb +2 -6
data/test/controller/helper_test.rb +15 -1
data/test/controller/html-scanner/document_test.rb +1 -1
data/test/controller/html-scanner/sanitizer_test.rb +1 -1
data/test/controller/http_basic_authentication_test.rb +88 -0
data/test/controller/http_digest_authentication_test.rb +178 -0
data/test/controller/integration_test.rb +56 -52
data/test/controller/layout_test.rb +46 -44
data/test/controller/middleware_stack_test.rb +90 -0
data/test/controller/mime_responds_test.rb +7 -11
data/test/controller/mime_type_test.rb +9 -0
data/test/controller/polymorphic_routes_test.rb +235 -151
data/test/controller/rack_test.rb +52 -81
data/test/controller/redirect_test.rb +6 -14
data/test/controller/render_test.rb +273 -60
data/test/controller/request/json_params_parsing_test.rb +45 -0
data/test/controller/request/multipart_params_parsing_test.rb +223 -0
data/test/controller/request/query_string_parsing_test.rb +120 -0
data/test/controller/request/url_encoded_params_parsing_test.rb +184 -0
data/test/controller/request/xml_params_parsing_test.rb +88 -0
data/test/controller/request_forgery_protection_test.rb +17 -98
data/test/controller/request_test.rb +45 -530
data/test/controller/rescue_test.rb +45 -22
data/test/controller/resources_test.rb +112 -37
data/test/controller/routing_test.rb +1442 -1384
data/test/controller/selector_test.rb +3 -3
data/test/controller/send_file_test.rb +30 -3
data/test/controller/session/cookie_store_test.rb +169 -240
data/test/controller/session/mem_cache_store_test.rb +94 -148
data/test/controller/session/test_session_test.rb +58 -0
data/test/controller/test_test.rb +32 -13
data/test/controller/url_rewriter_test.rb +54 -4
data/test/controller/verification_test.rb +1 -1
data/test/controller/view_paths_test.rb +15 -15
data/test/controller/webservice_test.rb +178 -147
data/test/fixtures/alternate_helpers/foo_helper.rb +3 -0
data/test/fixtures/layout_tests/alt/layouts/alt.rhtml +0 -0
data/test/fixtures/layouts/default_html.html.erb +1 -0
data/test/fixtures/layouts/xhr.html.erb +2 -0
data/test/fixtures/multipart/empty +10 -0
data/test/fixtures/multipart/hello.txt +1 -0
data/test/fixtures/multipart/none +9 -0
data/test/fixtures/public/500.da.html +1 -0
data/test/fixtures/quiz/questions/_question.html.erb +1 -0
data/test/fixtures/replies.yml +1 -1
data/test/fixtures/test/_one.html.erb +1 -0
data/test/fixtures/test/_two.html.erb +1 -0
data/test/fixtures/test/dont_pick_me +1 -0
data/test/fixtures/test/hello.builder +1 -1
data/test/fixtures/test/hello_world.da.html.erb +1 -0
data/test/fixtures/test/hello_world.erb~ +1 -0
data/test/fixtures/test/hello_world.pt-BR.html.erb +1 -0
data/test/fixtures/test/malformed/malformed.en.html.erb~ +1 -0
data/test/fixtures/test/malformed/malformed.erb~ +1 -0
data/test/fixtures/test/malformed/malformed.html.erb~ +1 -0
data/test/fixtures/test/render_explicit_html_template.js.rjs +1 -0
data/test/fixtures/test/render_implicit_html_template.js.rjs +1 -0
data/test/fixtures/test/render_implicit_html_template_from_xhr_request.da.html.erb +1 -0
data/test/fixtures/test/render_implicit_html_template_from_xhr_request.html.erb +1 -0
data/test/fixtures/test/render_implicit_js_template_without_layout.js.erb +1 -0
data/test/fixtures/test/utf8.html.erb +2 -0
data/test/template/active_record_helper_i18n_test.rb +31 -33
data/test/template/active_record_helper_test.rb +34 -0
data/test/template/asset_tag_helper_test.rb +52 -14
data/test/template/atom_feed_helper_test.rb +3 -5
data/test/template/benchmark_helper_test.rb +50 -24
data/test/template/compiled_templates_test.rb +177 -33
data/test/template/date_helper_i18n_test.rb +88 -81
data/test/template/date_helper_test.rb +427 -43
data/test/template/form_helper_test.rb +243 -44
data/test/template/form_options_helper_test.rb +631 -565
data/test/template/form_tag_helper_test.rb +9 -2
data/test/template/javascript_helper_test.rb +0 -5
data/test/template/number_helper_i18n_test.rb +60 -48
data/test/template/number_helper_test.rb +1 -0
data/test/template/render_test.rb +117 -35
data/test/template/test_test.rb +4 -6
data/test/template/text_helper_test.rb +129 -50
data/test/template/translation_helper_test.rb +23 -19
data/test/template/url_helper_test.rb +35 -2
data/test/view/test_case_test.rb +8 -0
metadata +197 -23
data/lib/action_controller/assertions.rb +0 -69
data/lib/action_controller/caching/sql_cache.rb +0 -18
data/lib/action_controller/cgi_ext/session.rb +0 -53
data/lib/action_controller/components.rb +0 -169
data/lib/action_controller/rack_process.rb +0 -297
data/lib/action_controller/request_profiler.rb +0 -169
data/lib/action_controller/session/active_record_store.rb +0 -340
data/lib/action_controller/session/drb_server.rb +0 -32
data/lib/action_controller/session/drb_store.rb +0 -35
data/test/controller/cgi_test.rb +0 -269
data/test/controller/components_test.rb +0 -156
data/test/controller/http_authentication_test.rb +0 -54
data/test/controller/integration_upload_test.rb +0 -43
data/test/controller/session_fixation_test.rb +0 -89
data/test/controller/session_management_test.rb +0 -178
data/test/fixtures/test/hello_world.js +0 -1

data/test/controller/mime_responds_test.rb CHANGED

@@ -162,13 +162,11 @@ class RespondToController < ActionController::Base
     end
 end
-class MimeControllerTest < Test::Unit::TestCase
+class MimeControllerTest < ActionController::TestCase
+  tests RespondToController
   def setup
     ActionController::Base.use_accept_header = true
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @controller = RespondToController.new
     @request.host = "www.example.com"
   end
@@ -471,7 +469,7 @@ class MimeControllerTest < Test::Unit::TestCase
     assert_equal '<html><div id="html_missing">Hello future from Firefox!</div></html>', @response.body
     @request.accept = "text/iphone"
-    assert_raises(ActionView::MissingTemplate) { get :iphone_with_html_response_type_without_layout }
+    assert_raise(ActionView::MissingTemplate) { get :iphone_with_html_response_type_without_layout }
   end
 end
@@ -509,12 +507,10 @@ class SuperPostController < PostController
   end
 end
-class MimeControllerLayoutsTest < Test::Unit::TestCase
-  def setup
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
+class MimeControllerLayoutsTest < ActionController::TestCase
+  tests PostController
-    @controller   = PostController.new
+  def setup
     @request.host = "www.example.com"
   end

data/test/controller/mime_type_test.rb CHANGED

@@ -81,4 +81,13 @@ class MimeTypeTest < Test::Unit::TestCase
     assert verified.each   { |type| assert  Mime.const_get(type.to_s.upcase).verify_request?, "Verifiable Mime Type is not verified: #{type.inspect}" }
     assert unverified.each { |type| assert !Mime.const_get(type.to_s.upcase).verify_request?, "Nonverifiable Mime Type is verified: #{type.inspect}" }
   end
+  def test_regexp_matcher
+    assert Mime::JS =~ "text/javascript"
+    assert Mime::JS =~ "application/javascript"
+    assert Mime::JS !~ "text/html"
+    assert !(Mime::JS !~ "text/javascript")
+    assert !(Mime::JS !~ "application/javascript")
+    assert Mime::HTML =~ 'application/xhtml+xml'
+  end
 end

data/test/controller/polymorphic_routes_test.rb CHANGED

@@ -18,192 +18,276 @@ class Tag < Article
   def response_id; 1 end
 end
+class Tax
+  attr_reader :id
+  def save; @id = 1 end
+  def new_record?; @id.nil? end
+  def name
+    model = self.class.name.downcase
+    @id.nil? ? "new #{model}" : "#{model} ##{@id}"
+  end
+end
+class Fax < Tax
+  def store_id; 1 end
+end
 # TODO: test nested models
 class Response::Nested < Response; end
-uses_mocha 'polymorphic URL helpers' do
-  class PolymorphicRoutesTest < Test::Unit::TestCase
+class PolymorphicRoutesTest < ActiveSupport::TestCase
+  include ActionController::PolymorphicRoutes
-    include ActionController::PolymorphicRoutes
+  def setup
+    @article = Article.new
+    @response = Response.new
+    @tax = Tax.new
+    @fax = Fax.new
+  end
-    def setup
-      @article = Article.new
-      @response = Response.new
-    end
-    def test_with_record
-      @article.save
-      expects(:article_url).with(@article)
-      polymorphic_url(@article)
-    end
+  def test_with_record
+    @article.save
+    expects(:article_url).with(@article)
+    polymorphic_url(@article)
+  end
-    def test_with_new_record
-      expects(:articles_url).with()
-      @article.expects(:new_record?).returns(true)
-      polymorphic_url(@article)
-    end
+  def test_with_new_record
+    expects(:articles_url).with()
+    @article.expects(:new_record?).returns(true)
+    polymorphic_url(@article)
+  end
-    def test_with_record_and_action
-      expects(:new_article_url).with()
-      @article.expects(:new_record?).never
-      polymorphic_url(@article, :action => 'new')
-    end
+  def test_with_record_and_action
+    expects(:new_article_url).with()
+    @article.expects(:new_record?).never
+    polymorphic_url(@article, :action => 'new')
+  end
-    def test_url_helper_prefixed_with_new
-      expects(:new_article_url).with()
-      new_polymorphic_url(@article)
-    end
+  def test_url_helper_prefixed_with_new
+    expects(:new_article_url).with()
+    new_polymorphic_url(@article)
+  end
-    def test_url_helper_prefixed_with_edit
-      @article.save
-      expects(:edit_article_url).with(@article)
-      edit_polymorphic_url(@article)
-    end
+  def test_url_helper_prefixed_with_edit
+    @article.save
+    expects(:edit_article_url).with(@article)
+    edit_polymorphic_url(@article)
+  end
-    def test_url_helper_prefixed_with_edit_with_url_options
-      @article.save
-      expects(:edit_article_url).with(@article, :param1 => '10')
-      edit_polymorphic_url(@article, :param1 => '10')
-    end
+  def test_url_helper_prefixed_with_edit_with_url_options
+    @article.save
+    expects(:edit_article_url).with(@article, :param1 => '10')
+    edit_polymorphic_url(@article, :param1 => '10')
+  end
-    def test_url_helper_with_url_options
-      @article.save
-      expects(:article_url).with(@article, :param1 => '10')
-      polymorphic_url(@article, :param1 => '10')
-    end
+  def test_url_helper_with_url_options
+    @article.save
+    expects(:article_url).with(@article, :param1 => '10')
+    polymorphic_url(@article, :param1 => '10')
+  end
-    def test_formatted_url_helper
-      expects(:formatted_article_url).with(@article, :pdf)
+  def test_formatted_url_helper_is_deprecated
+    expects(:articles_url).with(:format => :pdf)
+    assert_deprecated do
       formatted_polymorphic_url([@article, :pdf])
     end
+  end
-    def test_format_option
-      @article.save
-      expects(:formatted_article_url).with(@article, :pdf)
-      polymorphic_url(@article, :format => :pdf)
-    end
+  def test_format_option
+    @article.save
+    expects(:article_url).with(@article, :format => :pdf)
+    polymorphic_url(@article, :format => :pdf)
+  end
-    def test_format_option_with_url_options
-      @article.save
-      expects(:formatted_article_url).with(@article, :pdf, :param1 => '10')
-      polymorphic_url(@article, :format => :pdf, :param1 => '10')
-    end
+  def test_format_option_with_url_options
+    @article.save
+    expects(:article_url).with(@article, :format => :pdf, :param1 => '10')
+    polymorphic_url(@article, :format => :pdf, :param1 => '10')
+  end
-    def test_id_and_format_option
-      @article.save
-      expects(:article_url).with(:id => @article, :format => :pdf)
-      polymorphic_url(:id => @article, :format => :pdf)
-    end
+  def test_id_and_format_option
+    @article.save
+    expects(:article_url).with(:id => @article, :format => :pdf)
+    polymorphic_url(:id => @article, :format => :pdf)
+  end
-    def test_with_nested
-      @response.save
-      expects(:article_response_url).with(@article, @response)
-      polymorphic_url([@article, @response])
-    end
+  def test_with_nested
+    @response.save
+    expects(:article_response_url).with(@article, @response)
+    polymorphic_url([@article, @response])
+  end
-    def test_with_nested_unsaved
-      expects(:article_responses_url).with(@article)
-      polymorphic_url([@article, @response])
-    end
+  def test_with_nested_unsaved
+    expects(:article_responses_url).with(@article)
+    polymorphic_url([@article, @response])
+  end
-    def test_new_with_array_and_namespace
-      expects(:new_admin_article_url).with()
-      polymorphic_url([:admin, @article], :action => 'new')
-    end
+  def test_new_with_array_and_namespace
+    expects(:new_admin_article_url).with()
+    polymorphic_url([:admin, @article], :action => 'new')
+  end
-    def test_unsaved_with_array_and_namespace
-      expects(:admin_articles_url).with()
-      polymorphic_url([:admin, @article])
-    end
+  def test_unsaved_with_array_and_namespace
+    expects(:admin_articles_url).with()
+    polymorphic_url([:admin, @article])
+  end
-    def test_nested_unsaved_with_array_and_namespace
-      @article.save
-      expects(:admin_article_url).with(@article)
-      polymorphic_url([:admin, @article])
-      expects(:admin_article_responses_url).with(@article)
-      polymorphic_url([:admin, @article, @response])
-    end
+  def test_nested_unsaved_with_array_and_namespace
+    @article.save
+    expects(:admin_article_url).with(@article)
+    polymorphic_url([:admin, @article])
+    expects(:admin_article_responses_url).with(@article)
+    polymorphic_url([:admin, @article, @response])
+  end
-    def test_nested_with_array_and_namespace
-      @response.save
-      expects(:admin_article_response_url).with(@article, @response)
-      polymorphic_url([:admin, @article, @response])
+  def test_nested_with_array_and_namespace
+    @response.save
+    expects(:admin_article_response_url).with(@article, @response)
+    polymorphic_url([:admin, @article, @response])
-      # a ridiculously long named route tests correct ordering of namespaces and nesting:
-      @tag = Tag.new
-      @tag.save
-      expects(:site_admin_article_response_tag_url).with(@article, @response, @tag)
-      polymorphic_url([:site, :admin, @article, @response, @tag])
-    end
+    # a ridiculously long named route tests correct ordering of namespaces and nesting:
+    @tag = Tag.new
+    @tag.save
+    expects(:site_admin_article_response_tag_url).with(@article, @response, @tag)
+    polymorphic_url([:site, :admin, @article, @response, @tag])
+  end
-    def test_nesting_with_array_ending_in_singleton_resource
-      expects(:article_response_url).with(@article)
-      polymorphic_url([@article, :response])
-    end
+  def test_nesting_with_array_ending_in_singleton_resource
+    expects(:article_response_url).with(@article)
+    polymorphic_url([@article, :response])
+  end
-    def test_nesting_with_array_containing_singleton_resource
-      @tag = Tag.new
-      @tag.save
-      expects(:article_response_tag_url).with(@article, @tag)
-      polymorphic_url([@article, :response, @tag])
-    end
+  def test_nesting_with_array_containing_singleton_resource
+    @tag = Tag.new
+    @tag.save
+    expects(:article_response_tag_url).with(@article, @tag)
+    polymorphic_url([@article, :response, @tag])
+  end
-    def test_nesting_with_array_containing_namespace_and_singleton_resource
-      @tag = Tag.new
-      @tag.save
-      expects(:admin_article_response_tag_url).with(@article, @tag)
-      polymorphic_url([:admin, @article, :response, @tag])
-    end
+  def test_nesting_with_array_containing_namespace_and_singleton_resource
+    @tag = Tag.new
+    @tag.save
+    expects(:admin_article_response_tag_url).with(@article, @tag)
+    polymorphic_url([:admin, @article, :response, @tag])
+  end
-    def test_nesting_with_array_containing_singleton_resource_and_format
-      @tag = Tag.new
-      @tag.save
-      expects(:formatted_article_response_tag_url).with(@article, @tag, :pdf)
-      formatted_polymorphic_url([@article, :response, @tag, :pdf])
-    end
+  def test_nesting_with_array_containing_singleton_resource_and_format
+    @tag = Tag.new
+    @tag.save
+    expects(:article_response_tag_url).with(@article, @tag, :format => :pdf)
+    polymorphic_url([@article, :response, @tag], :format => :pdf)
+  end
-    def test_nesting_with_array_containing_singleton_resource_and_format_option
-      @tag = Tag.new
-      @tag.save
-      expects(:formatted_article_response_tag_url).with(@article, @tag, :pdf)
-      polymorphic_url([@article, :response, @tag], :format => :pdf)
-    end
+  def test_nesting_with_array_containing_singleton_resource_and_format_option
+    @tag = Tag.new
+    @tag.save
+    expects(:article_response_tag_url).with(@article, @tag, :format => :pdf)
+    polymorphic_url([@article, :response, @tag], :format => :pdf)
+  end
-    def test_nesting_with_array_containing_nil
-      expects(:article_response_url).with(@article)
-      polymorphic_url([@article, nil, :response])
-    end
+  def test_nesting_with_array_containing_nil
+    expects(:article_response_url).with(@article)
+    polymorphic_url([@article, nil, :response])
+  end
-    def test_with_array_containing_single_object
-      @article.save
-      expects(:article_url).with(@article)
-      polymorphic_url([nil, @article])
-    end
+  def test_with_array_containing_single_object
+    @article.save
+    expects(:article_url).with(@article)
+    polymorphic_url([nil, @article])
+  end
-    def test_with_array_containing_single_name
-      @article.save
-      expects(:articles_url)
-      polymorphic_url([:articles])
-    end
+  def test_with_array_containing_single_name
+    @article.save
+    expects(:articles_url)
+    polymorphic_url([:articles])
+  end
-    # TODO: Needs to be updated to correctly know about whether the object is in a hash or not
-    def xtest_with_hash
-      expects(:article_url).with(@article)
-      @article.save
-      polymorphic_url(:id => @article)
-    end
+  # TODO: Needs to be updated to correctly know about whether the object is in a hash or not
+  def xtest_with_hash
+    expects(:article_url).with(@article)
+    @article.save
+    polymorphic_url(:id => @article)
+  end
-    def test_polymorphic_path_accepts_options
-      expects(:new_article_path).with()
-      polymorphic_path(@article, :action => :new)
-    end
+  def test_polymorphic_path_accepts_options
+    expects(:new_article_path).with()
+    polymorphic_path(@article, :action => :new)
+  end
-    def test_polymorphic_path_does_not_modify_arguments
-      expects(:admin_article_responses_url).with(@article)
-      path = [:admin, @article, @response]
-      assert_no_difference 'path.size' do
-        polymorphic_url(path)
-      end
+  def test_polymorphic_path_does_not_modify_arguments
+    expects(:admin_article_responses_url).with(@article)
+    path = [:admin, @article, @response]
+    assert_no_difference 'path.size' do
+      polymorphic_url(path)
     end
   end
+  # Tests for names where .plural.singular doesn't round-trip
+  def test_with_irregular_plural_record
+    @tax.save
+    expects(:taxis_url).with(@tax)
+    polymorphic_url(@tax)
+  end
+  def test_with_irregular_plural_new_record
+    expects(:taxes_url).with()
+    @tax.expects(:new_record?).returns(true)
+    polymorphic_url(@tax)
+  end
+  def test_with_irregular_plural_record_and_action
+    expects(:new_taxis_url).with()
+    @tax.expects(:new_record?).never
+    polymorphic_url(@tax, :action => 'new')
+  end
+  def test_irregular_plural_url_helper_prefixed_with_new
+    expects(:new_taxis_url).with()
+    new_polymorphic_url(@tax)
+  end
+  def test_irregular_plural_url_helper_prefixed_with_edit
+    @tax.save
+    expects(:edit_taxis_url).with(@tax)
+    edit_polymorphic_url(@tax)
+  end
+  def test_with_nested_irregular_plurals
+    @fax.save
+    expects(:taxis_faxis_url).with(@tax, @fax)
+    polymorphic_url([@tax, @fax])
+  end
+  def test_with_nested_unsaved_irregular_plurals
+    expects(:taxis_faxes_url).with(@tax)
+    polymorphic_url([@tax, @fax])
+  end
+  def test_new_with_irregular_plural_array_and_namespace
+    expects(:new_admin_taxis_url).with()
+    polymorphic_url([:admin, @tax], :action => 'new')
+  end
+  def test_unsaved_with_irregular_plural_array_and_namespace
+    expects(:admin_taxes_url).with()
+    polymorphic_url([:admin, @tax])
+  end
+  def test_nesting_with_irregular_plurals_and_array_ending_in_singleton_resource
+    expects(:taxis_faxis_url).with(@tax)
+    polymorphic_url([@tax, :faxis])
+  end
+  def test_with_array_containing_single_irregular_plural_object
+    @tax.save
+    expects(:taxis_url).with(@tax)
+    polymorphic_url([nil, @tax])
+  end
+  def test_with_array_containing_single_name_irregular_plural
+    @tax.save
+    expects(:taxes_url)
+    polymorphic_url([:taxes])
+  end
 end