diff options
author | Robin Houston <robin@lenny.robin> | 2011-07-17 22:29:47 +0100 |
---|---|---|
committer | Robin Houston <robin@lenny.robin> | 2011-07-17 22:29:47 +0100 |
commit | 7b96f465eb908205286b7f6ec004f66145c14f4b (patch) | |
tree | b3ad3667653411ec5ca7fc4dfceafe3e3151d657 /spec/controllers/request_game_controller_spec.rb | |
parent | d2bae4563be978e99b4eb6c7daa95db67a51a41e (diff) | |
parent | c0391ee9f9e53ae28100815d396bc8d6eac949d2 (diff) |
Merge branch 'master' into wdtk
Conflicts:
config/routes.rb
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 eb05045e9..ce507fad1 100644 --- a/spec/controllers/request_game_controller_spec.rb +++ b/spec/controllers/request_game_controller_spec.rb @@ -4,7 +4,7 @@ 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 - it "should show the game homepage with the correct urls" do + it "should show the game homepage" do get :play response.should render_template('play') end |