Merge remote-tracking branch 'upstream/pull/2495'

2020-01-15 10:11:30 +00:00 · 2020-01-15 10:11:30 +00:00 · e72acaca9b
commit e72acaca9b
parent 2190aad23d 473da378b7
10 changed files with 1 additions and 45 deletions
--- a/test/controllers/api/users_controller_test.rb
+++ b/test/controllers/api/users_controller_test.rb
@ -2,12 +2,6 @@ require "test_helper"

 module Api
  class UsersControllerTest < ActionController::TestCase
-    def setup
-      super
-
-      stub_hostip_requests
-    end
-
    ##
    # test all routes which lead to this controller
    def test_routes
--- a/test/controllers/site_controller_test.rb
+++ b/test/controllers/site_controller_test.rb
@ -8,8 +8,6 @@ class SiteControllerTest < ActionController::TestCase

    Settings.id_key = create(:client_application).key
    Settings.potlatch2_key = create(:client_application).key
-
-    stub_hostip_requests
  end

  ##
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@ -1,12 +1,6 @@
 require "test_helper"

 class UsersControllerTest < ActionController::TestCase
-  def setup
-    super
-
-    stub_hostip_requests
-  end
-
  ##
  # test all routes which lead to this controller
  def test_routes