Merge branch 'sanitize-non-utf8-request-uri' into rails-3-develop

1 files changed, 6 insertions, 8 deletions

diff --git a/spec/integration/errors_spec.rb b/spec/integration/errors_spec.rb
index 532576bb9..110626058 100644
--- a/spec/integration/errors_spec.rb
+++ b/spec/integration/errors_spec.rb
@@ -61,14 +61,12 @@ describe "When errors occur" do
            response.body.should match("Sorry, we couldn't find that page")
         end
 
-        # it 'should handle non utf-8 parameters' do
-        #     pending 'until we sanitize non utf-8 parameters for Ruby >= 1.9' do
-        #         get ('/%d3')
-        #         response.should render_template('general/exception_caught')
-        #         response.code.should == '404'
-        #         response.body.should match("Sorry, we couldn't find that page")
-        #     end
-        # end
+        it 'should handle non utf-8 parameters' do
+            get ('/%d3')
+            response.should render_template('general/exception_caught')
+            response.code.should == '404'
+            response.body.should match("Sorry, we couldn't find that page")
+        end
 
 
         it "should render a 500 for general errors using the general/exception_caught template" do