Safely cleans up a test to avoid relying on a particular test order

actionpack/test/template/test_case_test.rb

@@ -89,6 +89,9 @@ module ActionView
       end
 
       test "helper class that is being tested is always included in view instance" do
+        # This ensure is a hidious hack to deal with these tests bleeding
+        # methods between eachother
+        begin
           self.class.helper_class.module_eval do
             def render_from_helper
               render :partial => 'customer', :collection => @customers
@@ -99,6 +102,10 @@ module ActionView
 
           @customers = [stub(:name => 'Eloy'), stub(:name => 'Manfred')]
           assert_match /Hello: EloyHello: Manfred/, render(:partial => 'test/from_helper')
+
+        ensure
+          self.class.helper_class.remove_method :render_from_helper
+        end
       end
 
       test "no additional helpers should shared across test cases" do
@@ -147,10 +154,16 @@ module ActionView
       end
 
       test "is able to make methods available to the view" do
+        # This ensure is a hidious hack to deal with these tests bleeding
+        # methods between eachother
+        begin
           _helpers.module_eval do
             def render_from_helper; from_test_case end
           end
           assert_equal 'Word!', render(:partial => 'test/from_helper')
+        ensure
+          _helpers.remove_method :render_from_helper
+        end
       end
 
       def from_test_case; 'Word!'; end