Merge branch 'master' into adequaterecord

* master:
  modify model generator warning message. refs [#174c9f0]
  Replace "data store" with database [ci skip]
  Return a hash rather than array from fetch_multi
  Fix concerning module reference [ci skip]
  Fixes docs typo in nested resource path helpers [skip ci]
  Fix some validators when used on model instance
  Pass strings to demodulize method
  pass strings to the underscore method
  speed up `underscore` in cases that don't need to do anything
  pass the class name to `tableize`
  [ci skip] Update list of files extensions in rake notes guide
  Fix controller test not resetting @_url_options

1 files changed, 23 insertions, 0 deletions

diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 5ff4a383ec..fbc10baf21 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -163,6 +163,29 @@ XML
     end
   end
 
+  class DefaultUrlOptionsCachingController < ActionController::Base
+    before_filter { @dynamic_opt = 'opt' }
+
+    def test_url_options_reset
+      render text: url_for(params)
+    end
+
+    def default_url_options
+      if defined?(@dynamic_opt)
+        super.merge dynamic_opt: @dynamic_opt
+      else
+        super
+      end
+    end
+  end
+
+  def test_url_options_reset
+    @controller = DefaultUrlOptionsCachingController.new
+    get :test_url_options_reset
+    assert_nil @request.params['dynamic_opt']
+    assert_match(/dynamic_opt=opt/, @response.body)
+  end
+
   def test_raw_post_handling
     params = Hash[:page, {:name => 'page name'}, 'some key', 123]
     post :render_raw_post, params.dup