diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-05 10:26:01 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-05 10:26:01 +0000 |
| commit | 6a93d027e744bfc4ab2f8f7808ee99c770003481 (patch) | |
| tree | b8bfe4e93e2314c8c7c9b95e99a861d8fad6b05f /spec/controllers/request_game_controller_spec.rb | |
| parent | 48bbe41b36402a22b808ec860c1a84673b74527f (diff) | |
| parent | b06195a428b5cb6c3e95b07c631e2f18febf05f0 (diff) | |
Merge branch 'release/0.5' into wdtk
Conflicts:
.gitignore
Diffstat (limited to 'spec/controllers/request_game_controller_spec.rb')
| -rw-r--r-- | spec/controllers/request_game_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/request_game_controller_spec.rb b/spec/controllers/request_game_controller_spec.rb index 4883bfdd6..cc0808ef3 100644 --- a/spec/controllers/request_game_controller_spec.rb +++ b/spec/controllers/request_game_controller_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe RequestGameController, "when playing the game" do - fixtures :info_requests, :info_request_events, :public_bodies, :public_body_translations, :users, :incoming_messages, :raw_emails, :outgoing_messages # all needed as integrating views + fixtures :public_bodies, :public_body_translations, :public_body_versions, :users, :info_requests, :raw_emails, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things # all needed as integrating views before(:each) do load_raw_emails_data(raw_emails) end |