Rename stub_signup_requests to stub_hostip_requests

diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb
index afa50a35696a2acfee56caceca4ab64b1dbdb08b..d559760afdb5f4fda9c840a509779583150d424c 100644 (file)
--- a/test/controllers/site_controller_test.rb
+++ b/test/controllers/site_controller_test.rb
@@ -9,7 +9,7 @@ class SiteControllerTest < ActionController::TestCase
     Object.const_set("ID_KEY", client_applications(:oauth_web_app).key)
     Object.const_set("POTLATCH2_KEY", client_applications(:oauth_web_app).key)
 
     Object.const_set("ID_KEY", client_applications(:oauth_web_app).key)
     Object.const_set("POTLATCH2_KEY", client_applications(:oauth_web_app).key)
 

-    stub_signup_requests
+    stub_hostip_requests

   end
 
   ##
   end
 
   ##

diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb
index e549ec90a07c9b5d4502dddd81814c7a8bfaac69..e309b1662b0d49073d23d552e0231cd937331c83 100644 (file)
--- a/test/controllers/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@ -4,7 +4,7 @@ class UserControllerTest < ActionController::TestCase
   api_fixtures
 
   def setup
   api_fixtures
 
   def setup

-    stub_signup_requests
+    stub_hostip_requests

   end
 
   ##
   end
 
   ##

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index 41c67863295b971f6fc9f6465715c06d5cdb2645..2452e6e6b8c76cfebd6eb8bd87956410e0511d40 100644 (file)
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -7,7 +7,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
   include OAuth::Helper
 
   def setup
   include OAuth::Helper
 
   def setup

-    stub_signup_requests
+    stub_hostip_requests

   end
 
   def test_oauth10_web_app
   end
 
   def test_oauth10_web_app

diff --git a/test/integration/page_locale_test.rb b/test/integration/page_locale_test.rb
index ee1f89afa23cc4918e5cde3023c99f179643ce52..c95af86abd4d0823262fe2f295523f5dcc18d1b2 100644 (file)
--- a/test/integration/page_locale_test.rb
+++ b/test/integration/page_locale_test.rb
@@ -5,7 +5,7 @@ class PageLocaleTest < ActionDispatch::IntegrationTest
 
   def setup
     I18n.locale = "en"
 
   def setup
     I18n.locale = "en"

-    stub_signup_requests
+    stub_hostip_requests

   end
 
   def teardown
   end
 
   def teardown

diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb
index aaa660dd2e2e2b75d1af3bf6d6b1e9bcbf134130..edf1c7c4a9deafc62065e6c41e33c82bb8ed7a46 100644 (file)
--- a/test/integration/user_roles_test.rb
+++ b/test/integration/user_roles_test.rb
@@ -4,7 +4,7 @@ class UserRolesTest < ActionDispatch::IntegrationTest
   fixtures :users, :user_roles
 
   def setup
   fixtures :users, :user_roles
 
   def setup

-    stub_signup_requests
+    stub_hostip_requests

   end
 
   test "grant" do
   end
 
   test "grant" do

diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb
index deb705f81be959c9de59654ce96dd9761cac8b99..e8d3df07a5618f5812c5d110190ff33ca638f84b 100644 (file)
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -4,7 +4,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest
   fixtures :users
 
   def setup
   fixtures :users
 
   def setup

-    stub_signup_requests
+    stub_hostip_requests

   end
 
   def test_api_blocked
   end
 
   def test_api_blocked

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 5f52bb135413deaa37bdd1b386e0e8227a3a5014..88cfe4831150440f4b67c2af6c41a61965768521 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -175,7 +175,7 @@ module ActiveSupport
       stub_request(:get, url).and_return(:status => status, :body => body)
     end
 
       stub_request(:get, url).and_return(:status => status, :body => body)
     end
 

-    def stub_signup_requests
+    def stub_hostip_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")
       # 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")