aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/general_controller_spec.rb
diff options
context:
space:
mode:
authorDavid Cabo <david@calibea.com>2011-10-13 00:32:50 +0200
committerDavid Cabo <david@calibea.com>2011-10-13 00:32:50 +0200
commit6bc07fec63a929d5413b33f7bc34e3505e17a090 (patch)
treee9715fb2e8d503ff88e5aa96ce06b5b3e6397bbc /spec/controllers/general_controller_spec.rb
parent6b19c36f114624d7e53be8edc9ee490ecd20d0b0 (diff)
parent65e172053d425e57b0b7df751f0be93cc1d7aff3 (diff)
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
Diffstat (limited to 'spec/controllers/general_controller_spec.rb')
-rw-r--r--spec/controllers/general_controller_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb
index 1ffbda90d..054b9881f 100644
--- a/spec/controllers/general_controller_spec.rb
+++ b/spec/controllers/general_controller_spec.rb
@@ -2,12 +2,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
describe GeneralController, "when searching" do
integrate_views
- fixtures [ :info_requests,
- :info_request_events,
- :public_bodies,
+ fixtures [ :public_bodies,
:public_body_translations,
:users,
:raw_emails,
+ :info_requests,
+ :info_request_events,
:outgoing_messages,
:incoming_messages,
:comments ]