diff options
| author | Francis Irving <francis@mysociety.org> | 2009-10-29 18:26:19 +0000 |
|---|---|---|
| committer | Francis Irving <francis@mysociety.org> | 2009-10-29 18:26:19 +0000 |
| commit | df76ff8f45365b667af249d2cb8ebf5321cbb5e3 (patch) | |
| tree | 81805d82b7ad6ac50bcf5168c2b295138fd24096 | |
| parent | b14bb2e8ee7a29a52aaa22acec19bf63b2673b8b (diff) | |
So fixtures and deliveries are right when run in alphabetical order.
| -rw-r--r-- | spec/controllers/admin_track_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/request_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/models/request_mailer_spec.rb | 1 | ||||
| -rw-r--r-- | spec/models/track_mailer_spec.rb | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/spec/controllers/admin_track_controller_spec.rb b/spec/controllers/admin_track_controller_spec.rb index a7d983ab8..58c0e0269 100644 --- a/spec/controllers/admin_track_controller_spec.rb +++ b/spec/controllers/admin_track_controller_spec.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe AdminTrackController, "when administering tracks" do integrate_views - fixtures :track_things + fixtures :track_things, :users it "shows the list page" do get :list diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb index e99732ec8..e4404d4d0 100644 --- a/spec/controllers/request_controller_spec.rb +++ b/spec/controllers/request_controller_spec.rb @@ -28,7 +28,7 @@ end describe RequestController, "when showing one request" do - fixtures :info_requests, :info_request_events, :public_bodies, :users, :incoming_messages, :raw_emails, :outgoing_messages # all needed as integrating views + fixtures :info_requests, :info_request_events, :public_bodies, :users, :incoming_messages, :raw_emails, :outgoing_messages, :comments # all needed as integrating views it "should be successful" do get :show, :url_title => 'why_do_you_have_such_a_fancy_dog' diff --git a/spec/models/request_mailer_spec.rb b/spec/models/request_mailer_spec.rb index 716c690a3..541f1da87 100644 --- a/spec/models/request_mailer_spec.rb +++ b/spec/models/request_mailer_spec.rb @@ -1,7 +1,6 @@ require File.dirname(__FILE__) + '/../spec_helper' describe RequestMailer, " when receiving incoming mail" do - fixtures :info_requests, :incoming_messages, :raw_emails, :users, :public_bodies it "should append it to the appropriate request" do diff --git a/spec/models/track_mailer_spec.rb b/spec/models/track_mailer_spec.rb index 0b1db6003..83bbc4c13 100644 --- a/spec/models/track_mailer_spec.rb +++ b/spec/models/track_mailer_spec.rb @@ -119,6 +119,8 @@ describe TrackMailer do mail['Auto-Submitted'].to_s.should == 'auto-generated' mail['Precedence'].to_s.should == 'bulk' + + deliveries.clear end end |