diff options
| author | David Cabo <david@calibea.com> | 2011-10-13 00:32:50 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-10-13 00:32:50 +0200 |
| commit | 6bc07fec63a929d5413b33f7bc34e3505e17a090 (patch) | |
| tree | e9715fb2e8d503ff88e5aa96ce06b5b3e6397bbc /spec/controllers/user_controller_spec.rb | |
| parent | 6b19c36f114624d7e53be8edc9ee490ecd20d0b0 (diff) | |
| parent | 65e172053d425e57b0b7df751f0be93cc1d7aff3 (diff) | |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
| -rw-r--r-- | spec/controllers/user_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index b4cc0d6e3..ae771da04 100644 --- a/spec/controllers/user_controller_spec.rb +++ b/spec/controllers/user_controller_spec.rb @@ -7,7 +7,7 @@ require 'json' describe UserController, "when showing a user" do integrate_views - fixtures :users, :outgoing_messages, :incoming_messages, :raw_emails, :info_requests, :info_request_events, :comments, :public_bodies, :public_body_translations + fixtures :users, :public_bodies, :public_body_translations, :info_requests, :raw_emails, :incoming_messages, :outgoing_messages, :info_request_events, :comments before(:each) do load_raw_emails_data(raw_emails) end |