From c5b027d3470bbcf051f3e38afbc54d56f10af3a9 Mon Sep 17 00:00:00 2001 From: Andrew Haines Date: Mon, 12 Nov 2012 07:09:42 +0000 Subject: [PATCH] Fix view context Closes #313 --- lib/draper/system.rb | 4 +++- lib/draper/view_context.rb | 5 ----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/draper/system.rb b/lib/draper/system.rb index fac81c3..03237c4 100755 --- a/lib/draper/system.rb +++ b/lib/draper/system.rb @@ -12,7 +12,9 @@ module Draper end def self.setup_action_mailer(component) - include Draper::ViewContext + component.class_eval do + include Draper::ViewContext + end end end end diff --git a/lib/draper/view_context.rb b/lib/draper/view_context.rb index ea8a024..a7a1724 100755 --- a/lib/draper/view_context.rb +++ b/lib/draper/view_context.rb @@ -26,11 +26,6 @@ module Draper def self.build_view_context current_controller.view_context.tap do |context| - context.instance_eval do - def url_options - ActionMailer::Base.default_url_options - end - end unless context.request if defined?(ActionController::TestRequest) context.controller.request ||= ActionController::TestRequest.new context.request ||= context.controller.request