lib/draper/test_case.rb in draper-1.0.0 vs lib/draper/test_case.rb in draper-1.1.0

@@ -11,10 +11,17 @@
     require 'active_support/test_case'
     ::ActiveSupport::TestCase
   end
 
   class TestCase < active_support_test_case
+    module ViewContextTeardown
+      def teardown
+        super
+        Draper::ViewContext.clear!
+      end
+    end
+
     module Behavior
       if defined?(::Devise)
         require 'draper/test/devise_helper'
         include Draper::DeviseHelper
       end
@@ -27,7 +34,20 @@
       include Draper::ViewHelpers::ClassMethods
       alias_method :helper, :helpers
     end
 
     include Behavior
+    include ViewContextTeardown
+  end
+end
+
+if defined?(ActionController::TestCase)
+  class ActionController::TestCase
+    include Draper::TestCase::ViewContextTeardown
+  end
+end
+
+if defined?(ActionMailer::TestCase)
+  class ActionMailer::TestCase
+    include Draper::TestCase::ViewContextTeardown
   end
 end