4 files changed, 9 insertions, 21 deletions
diff --git a/actionview/lib/action_view/helpers/url_helper.rb b/actionview/lib/action_view/helpers/url_helper.rb
index 1277126995..22cc4b2920 100644
--- a/actionview/lib/action_view/helpers/url_helper.rb
+++ b/actionview/lib/action_view/helpers/url_helper.rb
@@ -105,10 +105,9 @@ module ActionView
       #   driver to prompt with the question specified (in this case, the
       #   resulting text would be <tt>question?</tt>. If the user accepts, the
       #   link is processed normally, otherwise no action is taken.
-      # * <tt>:disable_with</tt> - Value of this parameter will be
-      #   used as the value for a disabled version of the submit
-      #   button when the form is submitted. This feature is provided
-      #   by the unobtrusive JavaScript driver.
+      # * <tt>:disable_with</tt> - Value of this parameter will be used as the
+      #   name for a disabled version of the link. This feature is provided by
+      #   the unobtrusive JavaScript driver.
       #
       # ==== Examples
       # Because it relies on +url_for+, +link_to+ supports both older-style controller/action/id arguments
diff --git a/actionview/lib/action_view/template/text.rb b/actionview/lib/action_view/template/text.rb
index e8d4e18f04..380528d6ef 100644
--- a/actionview/lib/action_view/template/text.rb
+++ b/actionview/lib/action_view/template/text.rb
@@ -4,10 +4,9 @@ module ActionView #:nodoc:
     class Text #:nodoc:
       attr_accessor :type
 
-      def initialize(string, type = nil)
+      def initialize(string)
         @string = string.to_s
-        @type   = Types[type] || type if type
-        @type ||= Types[:text]
+        @type = Types[:text]
       end
 
       def identifier
@@ -25,7 +24,7 @@ module ActionView #:nodoc:
       end
 
       def formats
-        [@type.respond_to?(:ref) ? @type.ref : @type.to_s]
+        [@type.ref]
       end
     end
   end
diff --git a/actionview/test/template/text_test.rb b/actionview/test/template/text_test.rb
index 6510688f97..ee526dc367 100644
--- a/actionview/test/template/text_test.rb
+++ b/actionview/test/template/text_test.rb
@@ -1,17 +1,7 @@
 require "abstract_unit"
 
 class TextTest < ActiveSupport::TestCase
-  test "formats returns symbol for recognized MIME type" do
-    assert_equal [:text], ActionView::Template::Text.new("", :text).formats
-  end
-
-  test "formats returns string for recognized MIME type when MIME does not have symbol" do
-    foo = Mime::Type.lookup("foo")
-    assert_nil foo.to_sym
-    assert_equal ["foo"], ActionView::Template::Text.new("", foo).formats
-  end
-
-  test "formats returns string for unknown MIME type" do
-    assert_equal ["foo"], ActionView::Template::Text.new("", "foo").formats
+  test "formats always return :text" do
+    assert_equal [:text], ActionView::Template::Text.new("").formats
   end
 end
diff --git a/actionview/test/ujs/server.rb b/actionview/test/ujs/server.rb
index c7698c87fa..cc02cd8419 100644
--- a/actionview/test/ujs/server.rb
+++ b/actionview/test/ujs/server.rb
@@ -96,7 +96,7 @@ class TestsController < ActionController::Base
 
       render html: html.html_safe
     else
-      render text: "ERROR: #{request.path} requested without ajax", status: 404
+      render plain: "ERROR: #{request.path} requested without ajax", status: 404
     end
   end
 end