Merge branch 'release/0.13'0.13

Conflicts:
    locale/bg/app.po
    locale/es/app.po
    locale/fi/app.po
    locale/fr/app.po
    locale/fr_CA/app.po
    locale/he_IL/app.po
    locale/hr/app.po
    locale/nb_NO/app.po
    locale/nl/app.po
    locale/pt_BR/app.po
    locale/ro_RO/app.po
    locale/sl/app.po
    locale/vi/app.po
    script/rails-post-deploy

1 files changed, 6 insertions, 9 deletions

diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index c73576c50..2c605a139 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
 
@@ -1645,10 +1646,6 @@ describe RequestController, "when classifying an information request" do
                 @dog_request = info_requests(:fancy_dog_request)
                 @dog_request.stub!(:each).and_return([@dog_request])
                 InfoRequest.stub!(:find).and_return(@dog_request)
-                RoutingFilter.active = false
-            end
-            after do
-                RoutingFilter.active = true
             end
 
             def request_url