Merge branch 'release/0.12' into wdtk

Conflicts:
    locale/he_IL/app.po
    locale/hr_HR/app.po
    locale/nb_NO/app.po
    locale/uk/app.po
    spec/models/info_request_spec.rb

1 files changed, 8 insertions, 1 deletions

diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb
index 4a1c8b134..61d847cec 100644
--- a/spec/controllers/general_controller_spec.rb
+++ b/spec/controllers/general_controller_spec.rb
@@ -21,6 +21,8 @@ describe GeneralController, 'when getting the blog feed' do
 
     before do
         AlaveteliConfiguration.stub!(:blog_feed).and_return("http://blog.example.com")
+        # Don't call out to external url during tests
+        controller.stub!(:quietly_try_to_open).and_return('')
     end
 
     it 'should add a lang param correctly to a url with no querystring' do
@@ -347,5 +349,10 @@ describe GeneralController, 'when using xapian search' do
         response.body.should include('Track this search')
     end
 
-end
+    it 'should ignore an odd ACCEPTS header' do
+        request.env['HTTP_ACCEPT'] = '*/*;q=0.01'
+        get :search, :combined => '"fancy dog"'
+        response.should be_success
+    end
 
+end