Merge branch 'extract_observers'

3 files changed, 0 insertions, 58 deletions

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 4f5b2895c9..95bff0a204 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -25,7 +25,6 @@ require 'active_support/dependencies'
 require 'active_model'
 require 'active_record'
 require 'action_controller/caching'
-require 'action_controller/caching/sweeping'
 
 require 'pp' # require 'pp' early to prevent hidden_methods from not picking up the pretty-print methods until too late
 
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index d203601771..1c59dd5953 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -499,18 +499,6 @@ class FilterTest < ActionController::TestCase
 
   end
 
-  class ::AppSweeper < ActionController::Caching::Sweeper; end
-  class SweeperTestController < ActionController::Base
-    cache_sweeper :app_sweeper
-    def show
-      render :text => 'hello world'
-    end
-
-    def error
-      raise StandardError.new
-    end
-  end
-
   class ImplicitActionsController < ActionController::Base
     before_filter :find_only, :only => :edit
     before_filter :find_except, :except => :edit
@@ -526,35 +514,6 @@ class FilterTest < ActionController::TestCase
     end
   end
 
-  def test_sweeper_should_not_ignore_no_method_error
-    sweeper = ActionController::Caching::Sweeper.send(:new)
-    assert_raise NoMethodError do
-      sweeper.send_not_defined
-    end
-  end
-
-  def test_sweeper_should_not_block_rendering
-    response = test_process(SweeperTestController)
-    assert_equal 'hello world', response.body
-  end
-
-  def test_sweeper_should_clean_up_if_exception_is_raised
-    assert_raise StandardError do
-      test_process(SweeperTestController, 'error')
-    end
-    assert_nil AppSweeper.instance.controller
-  end
-
-  def test_before_method_of_sweeper_should_always_return_true
-    sweeper = ActionController::Caching::Sweeper.send(:new)
-    assert sweeper.before(TestController.new)
-  end
-
-  def test_after_method_of_sweeper_should_always_return_nil
-    sweeper = ActionController::Caching::Sweeper.send(:new)
-    assert_nil sweeper.after(TestController.new)
-  end
-
   def test_non_yielding_around_filters_not_returning_false_do_not_raise
     controller = NonYieldingAroundFilterController.new
     controller.instance_variable_set "@filter_return_value", true
diff --git a/actionpack/test/controller/sweeper_test.rb b/actionpack/test/controller/sweeper_test.rb
deleted file mode 100644
index 0561efc62f..0000000000
--- a/actionpack/test/controller/sweeper_test.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'abstract_unit'
-
-
-class SweeperTest < ActionController::TestCase
-
-  class ::AppSweeper < ActionController::Caching::Sweeper; end
-
-  def test_sweeper_should_not_ignore_unknown_method_calls
-    sweeper = ActionController::Caching::Sweeper.send(:new)
-    assert_raise NameError do
-      sweeper.instance_eval do
-        some_method_that_doesnt_exist
-      end
-    end
-  end
-end