aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
diff options
context:
space:
mode:
authorColin Law <colin@clanlaw.org.uk>2009-01-11 12:13:50 +0000
committerColin Law <colin@clanlaw.org.uk>2009-01-11 12:13:50 +0000
commit55901d7d86f5608c4a07386ca6378121eb8127cb (patch)
tree8ede6a21529dfac8c818a3fe1584fb46f00c03ff /actionmailer/test
parent3e60ea6c231810e2b850492a86874b4800dfbf27 (diff)
parentcf4b24407ada79c133fbae1ec7db692882225956 (diff)
downloadrails-55901d7d86f5608c4a07386ca6378121eb8127cb.tar.gz
rails-55901d7d86f5608c4a07386ca6378121eb8127cb.tar.bz2
rails-55901d7d86f5608c4a07386ca6378121eb8127cb.zip
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionmailer/test')
-rw-r--r--actionmailer/test/abstract_unit.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index 4900f6fb35..a6126d6f7f 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -17,7 +17,6 @@ $:.unshift "#{File.dirname(__FILE__)}/fixtures/helpers"
FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
ActionMailer::Base.template_root = FIXTURE_LOAD_PATH
-ActionMailer::Base.template_root.load
class MockSMTP
def self.deliveries