Merge remote-tracking branch 'openstreetmap/pull/1395'

[rails.git] / test / controllers / user_controller_test.rb

diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb
index 1b9ada83b9f264e913272cd9198665627f34cff1..95eccb2c5b8acff30962f896329bedb073c37ca0 100644 (file)
--- a/test/controllers/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@ -3,8 +3,8 @@ require "test_helper"
 class UserControllerTest < ActionController::TestCase
   api_fixtures
 
-  setup do
-    stub_signup_requests
+  def setup
+    stub_hostip_requests
   end
 
   ##
@@ -1384,7 +1384,7 @@ class UserControllerTest < ActionController::TestCase
     get :list, :page => 3
     assert_response :success
     assert_template :list
-    assert_select "table#user_list tr", :count => 25
+    assert_select "table#user_list tr", :count => 26
   end
 
   def test_list_post_confirm