Use 'def setup' instead of 'setup do', for consistency

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index c45331f2062ce3ea995f571c4fc380ce894cb720..420512e741e075d894c8ec1fb78a1f1eba860b3e 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -174,5 +174,11 @@ module ActiveSupport
       url = "https://www.gravatar.com/avatar/#{hash}?d=404"
       stub_request(:get, url).and_return(:status => status, :body => body)
     end
+
+    def stub_signup_requests
+      # Controller tests and integration tests use different IPs
+      stub_request(:get, "http://api.hostip.info/country.php?ip=0.0.0.0")
+      stub_request(:get, "http://api.hostip.info/country.php?ip=127.0.0.1")
+    end
   end
 end