Merge remote-tracking branch 'openaustralia_github/tests_set_described_state' into rails-3-develop

Conflicts:
    spec/models/info_request_spec.rb

1 files changed, 6 insertions, 5 deletions

diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index c73576c50..387b040d6 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -1519,8 +1519,8 @@ describe RequestController, "when classifying an information request" do
                 post_status('rejected')
             end
 
-            it 'should not log a status update event' do
-                @dog_request.should_not_receive(:log_event)
+            it 'should log a status update event' do
+                @dog_request.should_receive(:log_event)
                 post_status('rejected')
             end
 
@@ -1573,11 +1573,12 @@ describe RequestController, "when classifying an information request" do
                 @dog_request.awaiting_description.should == false
                 @dog_request.described_state.should == 'rejected'
                 @dog_request.get_last_response_event.should == info_request_events(:useless_incoming_message_event)
-                @dog_request.get_last_response_event.calculated_state.should == 'rejected'
+                @dog_request.info_request_events.last.event_type.should == "status_update"
+                @dog_request.info_request_events.last.calculated_state.should == 'rejected'
             end
 
-            it 'should not log a status update event' do
-                @dog_request.should_not_receive(:log_event)
+            it 'should log a status update event' do
+                @dog_request.should_receive(:log_event)
                 post_status('rejected')
             end