Merge pull request #219 from cgunther/lazy-load-ar-base

Avoid eagerly loading ActionMailer::Base

lib/email_spec/deliveries.rb

@@ -73,12 +73,19 @@ module Deliveries
     if defined?(Pony)
       def deliveries; Pony::deliveries ; end
       include EmailSpec::MailerDeliveries
-    elsif ActionMailer::Base.delivery_method == :activerecord
-      include EmailSpec::ARMailerDeliveries
     else
-      def mailer; ActionMailer::Base; end
-      include EmailSpec::MailerDeliveries
+      ActiveSupport.on_load(:action_mailer) do
+        if delivery_method == :activerecord
+          ::EmailSpec::Helpers.include EmailSpec::ARMailerDeliveries
+        else
+          ::EmailSpec::Deliveries.module_eval do
+            def mailer
+              ActionMailer::Base
+            end
+          end
+          ::EmailSpec::Helpers.include ::EmailSpec::MailerDeliveries
+        end
+      end
     end
   end
 end
-

spec/email_spec/mail_ext_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'active_support'
 
 describe EmailSpec::MailExt do
   describe "#default_part" do

spec/spec_helper.rb

@@ -3,6 +3,9 @@
 require 'mail'
 require File.expand_path(File.dirname(__FILE__) + '/../lib/email_spec.rb')
 
+# Trigger loading ActionMailer::Base
+ActionMailer::Base
+
 RSpec.configure do |config|
   config.include EmailSpec::Helpers
   config.include EmailSpec::Matchers