lib/rails_helper.rb in rails_helper-2.1.0 vs lib/rails_helper.rb in rails_helper-2.2.0

@@ -1,8 +1,8 @@
 class Helper < (defined?(ActionView::Base) ? ActionView::Base : Object)
   def Helper.version
-    '2.1.0'
+    '2.2.0'
   end
 
   def Helper.dependencies
     {
       'rails_current'             => [ 'rails_current',             ' >= 1.0' ],
@@ -82,10 +82,10 @@
     response = ActionDispatch::TestResponse.new
 
     controller.request = request
     controller.response = response
 
-    controller.send(:default_url_options).merge!(DefaultUrlOptions) if defined?(DefaultUrlOptions)
+    controller.send(:default_url_options).dup.merge(DefaultUrlOptions.dup) if defined?(DefaultUrlOptions)
     controller
   end
 
   def Helper.current_controller
     Current.controller