lib/active_wrapper/mail.rb in winton-active_wrapper-0.1.8 vs lib/active_wrapper/mail.rb in winton-active_wrapper-0.1.9

@@ -3,19 +3,21 @@
     
     attr_reader :base, :env, :config
     
     def initialize(options)
       @base = options[:base]
-      @config = {}
+      @config = {
+        :smtp => options[:smtp] || {},
+        :imap => options[:imap] || {}
+      }
       @env = options[:env].to_s
       
       path = "#{base}/config/mail.yml"
       
       if @env == 'test'
         ActionMailer::Base.delivery_method = :test
+        @config = nil
       else
-        @config[:smtp] = options[:smtp] || {}
-        @config[:imap] = options[:imap] || {}
         if File.exists?(path)
           yaml = YAML::load(File.open(path))
           if yaml && yaml = yaml[@env].to_options
             @config[:imap] = yaml[:imap].to_options unless @config[:imap]
             @config[:smtp] = yaml[:smtp].to_options unless @config[:smtp]
\ No newline at end of file