diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-02-01 22:04:40 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-02-01 22:04:40 +0000 |
| commit | a76010c99459559a29901ed75b847384248c7c6e (patch) | |
| tree | f199e3f4187091a7a7c78f7fd6901529658174f7 /spec/lib | |
| parent | 9f9befeba613deff85c2325f629e77099d44af6f (diff) | |
| parent | 18c9436ba00574d44dc258a2f231d4758b378eae (diff) | |
Merge branch 'wdtk' into release/0.5
Conflicts:
locale/app.pot
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/tmail_extensions_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/lib/tmail_extensions_spec.rb b/spec/lib/tmail_extensions_spec.rb index 02ef8b82e..bd89e6a84 100644 --- a/spec/lib/tmail_extensions_spec.rb +++ b/spec/lib/tmail_extensions_spec.rb @@ -5,7 +5,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe "when using TMail" do - fixtures :info_requests, :incoming_messages before(:each) do ActionMailer::Base.deliveries.clear |