Merge remote-tracking branch 'origin/release/0.18'0.18

2 files changed, 26 insertions, 0 deletions

diff --git a/spec/integration/errors_spec.rb b/spec/integration/errors_spec.rb
index 17a0153c2..8ceb8243b 100644
--- a/spec/integration/errors_spec.rb
+++ b/spec/integration/errors_spec.rb
@@ -54,6 +54,21 @@ describe "When errors occur" do
             end
         end
 
+        it 'should render a 404 when given an invalid page parameter' do
+           get '/body/list/all', :page => 'xoforvfmy'
+           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 url encode params' 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
             InfoRequest.stub!(:find_by_url_title!).and_raise("An example error")
             get("/request/example")
diff --git a/spec/integration/ip_spoofing_spec.rb b/spec/integration/ip_spoofing_spec.rb
new file mode 100644
index 000000000..073f71ad6
--- /dev/null
+++ b/spec/integration/ip_spoofing_spec.rb
@@ -0,0 +1,11 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe 'when getting a country message' do
+
+    it 'should not raise an IP spoofing error when given mismatched headers' do
+        get '/country_message', nil, { 'HTTP_X_FORWARDED_FOR' => '1.2.3.4',
+                                       'HTTP_CLIENT_IP' => '5.5.5.5' }
+        response.status.should == 200
+    end
+
+end