diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/controllers/request_controller_spec.rb | 6 | ||||
| -rw-r--r-- | spec/fixtures/info_request_events.yml | 3 | ||||
| -rw-r--r-- | spec/fixtures/info_requests.yml | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb index 0aa873d08..07a856585 100644 --- a/spec/controllers/request_controller_spec.rb +++ b/spec/controllers/request_controller_spec.rb @@ -166,21 +166,21 @@ describe RequestController, "when classifying an individual response" do fixtures :info_requests, :info_request_events, :public_bodies, :users, :incoming_messages, :outgoing_messages # all needed as integrating views it "should require login" do - post :describe_state, :incoming_message => { :described_state => "rejected" }, :id => info_requests(:fancy_dog_request).id, :incoming_message_id => incoming_messages(:useless_incoming_message), :submitted_describe_state => 1 + post :describe_state, :incoming_message => { :described_state => "rejected" }, :id => info_requests(:fancy_dog_request).id, :incoming_message_id => incoming_messages(:useless_incoming_message), :last_info_request_event_id => info_request_events(:useless_incoming_message_event).id, :submitted_describe_state => 1 post_redirect = PostRedirect.get_last_post_redirect response.should redirect_to(:controller => 'user', :action => 'signin', :token => post_redirect.token) end it "should not classify response if logged in as wrong user" do session[:user_id] = users(:silly_name_user).id - post :describe_state, :incoming_message => { :described_state => "rejected" }, :id => info_requests(:fancy_dog_request).id, :incoming_message_id => incoming_messages(:useless_incoming_message), :submitted_describe_state => 1 + post :describe_state, :incoming_message => { :described_state => "rejected" }, :id => info_requests(:fancy_dog_request).id, :incoming_message_id => incoming_messages(:useless_incoming_message), :last_info_request_event_id => info_request_events(:useless_incoming_message_event).id, :submitted_describe_state => 1 response.should render_template('user/wrong_user') end it "should successfully classify response if logged in as user controlling request" do info_requests(:fancy_dog_request).awaiting_description.should == true session[:user_id] = users(:bob_smith_user).id - post :describe_state, :incoming_message => { :described_state => "rejected" }, :id => info_requests(:fancy_dog_request).id, :incoming_message_id => incoming_messages(:useless_incoming_message), :submitted_describe_state => 1 + post :describe_state, :incoming_message => { :described_state => "rejected" }, :id => info_requests(:fancy_dog_request).id, :incoming_message_id => incoming_messages(:useless_incoming_message), :last_info_request_event_id => info_request_events(:useless_incoming_message_event).id, :submitted_describe_state => 1 response.should redirect_to(:controller => 'help', :action => 'unhappy') info_requests(:fancy_dog_request).reload info_requests(:fancy_dog_request).awaiting_description.should == false diff --git a/spec/fixtures/info_request_events.yml b/spec/fixtures/info_request_events.yml index 260688999..af8869511 100644 --- a/spec/fixtures/info_request_events.yml +++ b/spec/fixtures/info_request_events.yml @@ -5,6 +5,7 @@ useless_outgoing_message_event: info_request_id: 101 event_type: sent created_at: 2007-10-25 10:41:12.686264 + described_state: silly_outgoing_message_event: params_yaml: "--- \n\ :outgoing_message_id: 2\n" @@ -12,6 +13,7 @@ silly_outgoing_message_event: info_request_id: 103 event_type: sent created_at: 2007-10-14 10:41:12.686264 + described_state: useless_incoming_message_event: params_yaml: "--- \n\ :incoming_message_id: 1\n" @@ -19,3 +21,4 @@ useless_incoming_message_event: info_request_id: 101 event_type: response created_at: 2007-11-13 18:09:20.042061 + described_state: diff --git a/spec/fixtures/info_requests.yml b/spec/fixtures/info_requests.yml index 3fc3ea7f4..d9aa0d627 100644 --- a/spec/fixtures/info_requests.yml +++ b/spec/fixtures/info_requests.yml @@ -5,9 +5,8 @@ fancy_dog_request: updated_at: 2007-10-11 18:15:57 public_body_id: 2 user_id: 1 - described_state: awaiting_response + described_state: waiting_response awaiting_description: true - described_last_incoming_message_id: nil naughty_chicken_request: id: 103 title: How much public money is wasted on breeding naughty chickens? @@ -15,8 +14,7 @@ naughty_chicken_request: updated_at: 2007-10-13 18:15:57 public_body_id: 2 user_id: 1 - described_state: awaiting_response + described_state: waiting_response awaiting_description: false - described_last_incoming_message_id: nil |