removed deprecated methods, and related tests, from ActionPack

8 files changed, 3 insertions, 105 deletions

diff --git a/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb b/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
deleted file mode 100644
index 0c02afea36..0000000000
--- a/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'abstract_unit'
-
-class DeprecatedBaseMethodsTest < ActionController::TestCase
-  class Target < ActionController::Base
-    def home_url(greeting)
-      "http://example.com/#{greeting}"
-    end
-
-    def raises_name_error
-      this_method_doesnt_exist
-    end
-
-    def rescue_action(e) raise e end
-  end
-
-  tests Target
-
-  if defined? Test::Unit::Error
-    def test_assertion_failed_error_silences_deprecation_warnings
-      get :raises_name_error
-    rescue => e
-      error = Test::Unit::Error.new('testing ur doodz', e)
-      assert_not_deprecated { error.message }
-    end
-  end
-end
diff --git a/actionpack/test/controller/helper_test.rb b/actionpack/test/controller/helper_test.rb
index 9f0670ffdf..584d73668a 100644
--- a/actionpack/test/controller/helper_test.rb
+++ b/actionpack/test/controller/helper_test.rb
@@ -77,7 +77,7 @@ class HelperTest < ActiveSupport::TestCase
     self.test_helper = LocalAbcHelper
   end
 
-  def test_deprecated_helper
+  def test_helper
     assert_equal expected_helper_methods, missing_methods
     assert_nothing_raised { @controller_class.helper TestHelper }
     assert_equal [], missing_methods
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index e62f3155c5..be59da9105 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -1023,11 +1023,6 @@ class RenderTest < ActionController::TestCase
     assert_equal " ", @response.body
   end
 
-  def test_render_to_string_not_deprecated
-    assert_not_deprecated { get :hello_in_a_string }
-    assert_equal "How's there? goodbyeHello: davidHello: marygoodbye\n", @response.body
-  end
-
   def test_render_to_string_doesnt_break_assigns
     get :render_to_string_with_assigns
     assert_equal "i'm before the render", assigns(:before)
@@ -1106,7 +1101,7 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_yield_content_for
-    assert_not_deprecated { get :yield_content_for }
+    get :yield_content_for
     assert_equal "<title>Putting stuff in the title!</title>\nGreat stuff!\n", @response.body
   end
 
diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index 3de1849db8..f5ac886c20 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -32,17 +32,11 @@ class ViewLoadPathsTest < ActionController::TestCase
     @controller.send :assign_shortcuts, @request, @response
     @controller.send :initialize_template_class, @response
 
-    # Track the last warning.
-    @old_behavior = ActiveSupport::Deprecation.behavior
-    @last_message = nil
-    ActiveSupport::Deprecation.behavior = Proc.new { |message, callback| @last_message = message }
-
     @paths = TestController.view_paths
   end
 
   def teardown
     TestController.view_paths = @paths
-    ActiveSupport::Deprecation.behavior = @old_behavior
   end
 
   def expand(array)
@@ -179,7 +173,7 @@ class ViewLoadPathsTest < ActionController::TestCase
     assert_nothing_raised { C.append_view_path 'c/path' }
     assert_paths C, "c/path"
   end
-  
+
   def test_lookup_context_accessor
     assert_equal ["test"], TestController.new.lookup_context.prefixes
   end
diff --git a/actionpack/test/dispatch/response_body_is_proc_test.rb b/actionpack/test/dispatch/response_body_is_proc_test.rb
deleted file mode 100644
index fd94832624..0000000000
--- a/actionpack/test/dispatch/response_body_is_proc_test.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'abstract_unit'
-
-class ResponseBodyIsProcTest < ActionDispatch::IntegrationTest
-  class TestController < ActionController::Base
-    def test
-      self.response_body = proc { |response, output|
-        output.write 'Hello'
-      }
-    end
-  end
-
-  def test_simple_get
-    with_test_route_set do
-      assert_deprecated do
-        get '/test'
-      end
-      assert_response :success
-      assert_equal 'Hello', response.body
-    end
-  end
-
-  private
-
-    def with_test_route_set(options = {})
-      with_routing do |set|
-        set.draw do
-          match ':action', :to => ::ResponseBodyIsProcTest::TestController
-        end
-
-        @app = self.class.build_app(set) do |middleware|
-          middleware.delete "ActionDispatch::ShowExceptions"
-        end
-
-        yield
-      end
-    end
-end
diff --git a/actionpack/test/fixtures/test/deprecated_nested_layout.erb b/actionpack/test/fixtures/test/deprecated_nested_layout.erb
deleted file mode 100644
index 7b6dcbb6c7..0000000000
--- a/actionpack/test/fixtures/test/deprecated_nested_layout.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% content_for :title, "title" -%>
-<% content_for :column do -%>column<% end -%>
-<% render :layout => 'layouts/column' do -%>content<% end -%>
\ No newline at end of file
diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb
index 63b92aadf4..0104c20bc7 100644
--- a/actionpack/test/template/number_helper_test.rb
+++ b/actionpack/test/template/number_helper_test.rb
@@ -19,15 +19,6 @@ class NumberHelperTest < ActionView::TestCase
     gigabytes(number) * 1024
   end
 
-  def silence_deprecation_warnings
-    @old_deprecatios_silenced = ActiveSupport::Deprecation.silenced
-    ActiveSupport::Deprecation.silenced  = true
-  end
-
-  def restore_deprecation_warnings
-    ActiveSupport::Deprecation.silenced  = @old_deprecatios_silenced
-  end
-
   def test_number_to_phone
     assert_equal("555-1234", number_to_phone(5551234))
     assert_equal("800-555-1212", number_to_phone(8005551212))
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index cd4618a505..f463675a2e 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -141,22 +141,6 @@ module ActionView
     end
   end
 
-  class AssignsTest < ActionView::TestCase
-    setup do
-      ActiveSupport::Deprecation.stubs(:warn)
-    end
-
-    test "_assigns delegates to user_defined_ivars" do
-      self.expects(:view_assigns)
-      _assigns
-    end
-
-    test "_assigns is deprecated" do
-      ActiveSupport::Deprecation.expects(:warn)
-      _assigns
-    end
-  end
-
   class ViewAssignsTest < ActionView::TestCase
     test "view_assigns returns a Hash of user defined ivars" do
       @a = 'b'