Merge branch 'release/0.21'0.21.0.0

Conflicts:
	locale/cy/app.po
	locale/es_NI/app.po
	locale/hr/app.po
	locale/is_IS/app.po
	locale/sr@latin/app.po

1 files changed, 1 insertions, 4 deletions

diff --git a/spec/integration/errors_spec.rb b/spec/integration/errors_spec.rb
index 4fa12fb21..39f1279ce 100644
--- a/spec/integration/errors_spec.rb
+++ b/spec/integration/errors_spec.rb
@@ -59,7 +59,6 @@ describe "When errors occur" do
            response.should render_template('general/exception_caught')
            response.code.should == '404'
            response.body.should match("Sorry, we couldn't find that page")
-           response.body.should match(%Q(invalid value for Integer))
         end
 
         # it 'should handle non utf-8 parameters' do
@@ -76,7 +75,6 @@ describe "When errors occur" do
             InfoRequest.stub!(:find_by_url_title!).and_raise("An example error")
             get("/request/example")
             response.should render_template('general/exception_caught')
-            response.body.should match('An example error')
             response.code.should == "500"
         end
 
@@ -111,7 +109,6 @@ describe "When errors occur" do
             get("/es/request/example")
             response.should render_template('general/exception_caught')
             response.body.should match('Lo sentimos, hubo un problema procesando esta página')
-            response.body.should match('An example error')
         end
 
         it "should render a 403 with text body for attempts at directory listing for attachments" do
@@ -136,7 +133,7 @@ describe "When errors occur" do
 
             it 'should show a full trace for general errors' do
                 InfoRequest.stub!(:find).and_raise("An example error")
-                get("/admin/request/show/333")
+                get("/admin/requests/333")
                 response.body.should have_selector('div[id=traces]')
                 response.body.should match('An example error')
             end