merge upstream changes due to funky rebasing -- should be synced w/ `…

…jcasimir/master` now

lib/draper.rb

@@ -10,6 +10,6 @@
 require 'draper/view_context'
 require 'draper/decorated_enumerable_proxy'
 require 'draper/rspec_integration' if defined?(RSpec) and RSpec.respond_to?(:configure)
-require 'draper/minitest_integration' if defined?(MiniTest)
+require 'draper/minitest_integration'
 require 'draper/railtie' if defined?(Rails)
 

lib/draper/minitest_integration.rb

@@ -1,25 +1,26 @@
-MiniTest::Spec.register_spec_type(MiniTest::Spec::Decorator) do |desc|
-  desc.superclass == Draper::Base
-end
+require 'minitest/unit'
+require 'minitest/spec'
 
 module MiniTest
-  module Spec
-    class Decorator < Spec
-      before :each do
-          ApplicationController.new.set_current_view_context
-          Draper::ViewContext.current.controller.request ||= ActionController::TestRequest.new
-          Draper::ViewContext.current.request            ||= Draper::ViewContext.current.controller.request
-          Draper::ViewContext.current.params             ||= {}
-      end
+  class DecoratorSpec < Spec
+    before do
+      ApplicationController.new.set_current_view_context
+      Draper::ViewContext.current.controller.request ||= ActionController::TestRequest.new
+      Draper::ViewContext.current.request            ||= Draper::ViewContext.current.controller.request
+      Draper::ViewContext.current.params             ||= {}
     end
   end
 end
 
-class MiniTest::Unit
-  before :each do
+class MiniTest::Unit::DecoratorTestCase < MiniTest::Unit::TestCase
+  add_setup_hook do
     ApplicationController.new.set_current_view_context
     Draper::ViewContext.current.controller.request ||= ActionController::TestRequest.new
     Draper::ViewContext.current.request            ||= Draper::ViewContext.current.controller.request
     Draper::ViewContext.current.params             ||= {}
   end
 end
+
+MiniTest::Spec.register_spec_type(MiniTest::DecoratorSpec) do |desc|
+  desc.superclass == Draper::Base
+end