Fix failing tests and use new hash style in deprecation messages

4 files changed, 16 insertions, 16 deletions

diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index 6b3d80cbf0..dec87013d3 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -519,7 +519,7 @@ module ActionView
         else
           prompt  = options
           options = {}
-          message = "Passing the prompt to grouped_options_for_select as an argument is deprecated. " /
+          message = "Passing the prompt to grouped_options_for_select as an argument is deprecated. " \
                     "Please use an options hash like `{ prompt: #{prompt.inspect} }`."
           ActiveSupport::Deprecation.warn(message, caller)
         end
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index c92b38e2b9..11bc0cbec8 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -425,16 +425,16 @@ module ActionView
         options = options.stringify_keys
 
         if disable_with = options.delete("disable_with")
-          message = ":disable_with option is deprecated and will be removed from Rails 4.1. " /
-                    "Use ':data => { :disable_with => \'Text\' }' instead."
+          message = ":disable_with option is deprecated and will be removed from Rails 4.1. " \
+                    "Use 'data: { disable_with: \'Text\' }' instead."
           ActiveSupport::Deprecation.warn(message, caller)
 
           options["data-disable-with"] = disable_with
         end
 
         if confirm = options.delete("confirm")
-          message = ":confirm option is deprecated and will be removed from Rails 4.1. " /
-                    "Use ':data => { :confirm => \'Text\' }' instead'."
+          message = ":confirm option is deprecated and will be removed from Rails 4.1. " \
+                    "Use 'data: { confirm: \'Text\' }' instead'."
           ActiveSupport::Deprecation.warn(message, caller)
 
           options["data-confirm"] = confirm
@@ -487,16 +487,16 @@ module ActionView
         options = options.stringify_keys
 
         if disable_with = options.delete("disable_with")
-          message = ":disable_with option is deprecated and will be removed from Rails 4.1. " /
-                    "Use ':data => { :disable_with => \'Text\' }' instead."
+          message = ":disable_with option is deprecated and will be removed from Rails 4.1. " \
+                    "Use 'data: { disable_with: \'Text\' }' instead."
           ActiveSupport::Deprecation.warn(message, caller)
 
           options["data-disable-with"] = disable_with
         end
 
         if confirm = options.delete("confirm")
-          message = ":confirm option is deprecated and will be removed from Rails 4.1. " /
-                    "Use ':data => { :confirm => \'Text\' }' instead'."
+          message = ":confirm option is deprecated and will be removed from Rails 4.1. " \
+                    "Use 'data: { confirm: \'Text\' }' instead'."
           ActiveSupport::Deprecation.warn(message, caller)
 
           options["data-confirm"] = confirm
@@ -541,8 +541,8 @@ module ActionView
         options = options.stringify_keys
 
         if confirm = options.delete("confirm")
-          message = ":confirm option is deprecated and will be removed from Rails 4.1. " /
-                    "Use ':data => { :confirm => \'Text\' }' instead'."
+          message = ":confirm option is deprecated and will be removed from Rails 4.1. " \
+                    "Use 'data: { confirm: \'Text\' }' instead'."
           ActiveSupport::Deprecation.warn(message, caller)
 
           options["data-confirm"] = confirm
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 4d6367e66a..2a1dd86e0a 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -577,8 +577,8 @@ module ActionView
             method  = html_options.delete('method')
 
             if confirm
-              message = ":confirm option is deprecated and will be removed from Rails 4.1. " /
-                        "Use ':data => { :confirm => \'Text\' }' instead."
+              message = ":confirm option is deprecated and will be removed from Rails 4.1. " \
+                        "Use 'data: { confirm: \'Text\' }' instead."
               ActiveSupport::Deprecation.warn(message, caller)
 
               html_options["data-confirm"] = confirm
@@ -587,8 +587,8 @@ module ActionView
             add_method_to_attributes!(html_options, method) if method
 
             if disable_with
-              message = ":disable_with option is deprecated and will be removed from Rails 4.1. " /
-                        "Use ':data => { :disable_with => \'Text\' }' instead."
+              message = ":disable_with option is deprecated and will be removed from Rails 4.1. " \
+                        "Use 'data: { disable_with: \'Text\' }' instead."
               ActiveSupport::Deprecation.warn(message, caller)
 
               html_options["data-disable-with"] = disable_with
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index 32a9152707..086cc0bacc 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -235,7 +235,7 @@ module ActionView
 
       extension = pieces.pop
       unless extension
-        message = "The file #{path} did not specify a template handler. The default is currently ERB, " /
+        message = "The file #{path} did not specify a template handler. The default is currently ERB, " \
                   "but will change to RAW in the future."
         ActiveSupport::Deprecation.warn(message, caller)
       end