From d7690d24b0359436da403532c1dc6be8ca64e99f Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Thu, 29 Jun 2017 16:05:01 -0700
Subject: [PATCH] fixes #3039

---
 Gemfile                            | 2 +-
 Gemfile.lock                       | 9 +++++++--
 test/helpers/iqdb_test_helper.rb   | 2 +-
 test/helpers/reportbooru_helper.rb | 6 +++---
 test/test_helper.rb                | 1 +
 test/unit/saved_search_test.rb     | 9 ++-------
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index dc59a76af..41c590912 100644
--- a/Gemfile
+++ b/Gemfile
@@ -76,6 +76,6 @@ group :test do
   gem "ffaker"
   gem "simplecov", :require => false
   gem "timecop"
-  gem "fakeweb"
+  gem "webmock"
   gem "test_after_commit" # XXX remove me after upgrading to rails 5.
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index c641d8c14..6f6b7b7ad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -108,6 +108,8 @@ GEM
     cityhash (0.8.1)
     coderay (1.1.1)
     colorize (0.7.7)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
     crass (1.0.2)
     daemons (1.2.3)
     dalli (2.7.6)
@@ -128,7 +130,6 @@ GEM
     execjs (2.7.0)
     factory_girl (4.8.0)
       activesupport (>= 3.0.0)
-    fakeweb (1.3.0)
     faraday (0.10.1)
       multipart-post (>= 1.2, < 3)
     ffaker (2.5.0)
@@ -294,6 +295,7 @@ GEM
     rmagick (2.16.0)
     ruby-prof (0.15.8)
     rubyzip (1.1.7)
+    safe_yaml (1.0.4)
     sanitize (4.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
@@ -380,6 +382,9 @@ GEM
     unicorn-worker-killer (0.4.4)
       get_process_mem (~> 0)
       unicorn (>= 4, < 6)
+    webmock (1.21.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
     webrobots (0.1.2)
     whenever (0.9.7)
       chronic (>= 0.6.3)
@@ -409,7 +414,6 @@ DEPENDENCIES
   dotenv-rails
   dtext_rb!
   factory_girl
-  fakeweb
   ffaker
   gctools
   google-api-client
@@ -452,6 +456,7 @@ DEPENDENCIES
   uglifier
   unicorn
   unicorn-worker-killer
+  webmock
   whenever
 
 BUNDLED WITH
diff --git a/test/helpers/iqdb_test_helper.rb b/test/helpers/iqdb_test_helper.rb
index 3c157d332..9bcdec4f4 100644
--- a/test/helpers/iqdb_test_helper.rb
+++ b/test/helpers/iqdb_test_helper.rb
@@ -27,6 +27,6 @@ module IqdbTestHelper
     url = "http://localhost:3004/similar?key=hunter2&url=#{CGI.escape source}&ref"
     body = matches.map { |post| { post_id: post.id } }.to_json
 
-    FakeWeb.register_uri(:get, url, body: body)
+    stub_request(:get, url).to_return(body: body)
   end
 end
diff --git a/test/helpers/reportbooru_helper.rb b/test/helpers/reportbooru_helper.rb
index 1591c1ef4..1f71da77b 100644
--- a/test/helpers/reportbooru_helper.rb
+++ b/test/helpers/reportbooru_helper.rb
@@ -1,12 +1,12 @@
 module ReportbooruHelper
   def mock_popular_search_service!
     Danbooru.config.stubs(:reportbooru_server).returns("http://localhost:3003")
-    FakeWeb.register_uri(:get, "http://localhost:3003/hits/month?date=#{Date.today}", body: "kantai_collection 1000.0\ntouhou 500.0")
-    FakeWeb.register_uri(:get, "http://localhost:3003/hits/day?date=#{Date.today}", body: "kantai_collection 1000.0\ntouhou 500.0")
+    stub_request(:get, "http://localhost:3003/hits/month?date=#{Date.today}").to_return(body: "kantai_collection 1000.0\ntouhou 500.0")
+    stub_request(:get, "http://localhost:3003/hits/day?date=#{Date.today}").to_return(body: "kantai_collection 1000.0\ntouhou 500.0")
   end
 
   def mock_missed_search_service!
     Danbooru.config.stubs(:reportbooru_server).returns("http://localhost:3003")
-    FakeWeb.register_uri(:get, "http://localhost:3003/missed_searches", body: "kantai_collection 1000.0\ntouhou 500.0")
+    stub_request(:get, "http://localhost:3003/missed_searches").to_return(body: "kantai_collection 1000.0\ntouhou 500.0")
   end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 623090386..a1f9b83f6 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -11,6 +11,7 @@ end
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 require 'cache'
+require 'webmock/minitest'
 
 Dir[File.expand_path(File.dirname(__FILE__) + "/factories/*.rb")].each {|file| require file}
 Dir[File.expand_path(File.dirname(__FILE__) + "/helpers/*.rb")].each {|file| require file}
diff --git a/test/unit/saved_search_test.rb b/test/unit/saved_search_test.rb
index c8040c19d..a5d016478 100644
--- a/test/unit/saved_search_test.rb
+++ b/test/unit/saved_search_test.rb
@@ -1,6 +1,5 @@
 require 'test_helper'
 require 'helpers/saved_search_test_helper'
-require 'fakeweb'
 
 class SavedSearchTest < ActiveSupport::TestCase
   include SavedSearchTestHelper
@@ -46,14 +45,10 @@ class SavedSearchTest < ActiveSupport::TestCase
   end
 
   context "Fetching the post ids for a search" do
-    teardown do
-      FakeWeb.clean_registry
-    end
-
     context "with a label" do
       setup do
         SavedSearch.expects(:queries_for).with(1, "blah").returns(%w(a b c))
-        FakeWeb.register_uri(:post, "http://localhost:3001/v2/search", :body => "1 2 3 4")
+        stub_request(:post, "http://localhost:3001/v2/search").to_return(:body => "1 2 3 4")
       end
 
       should "return a list of ids" do
@@ -65,7 +60,7 @@ class SavedSearchTest < ActiveSupport::TestCase
     context "without a label" do
       setup do
         SavedSearch.expects(:queries_for).with(1, nil).returns(%w(a b c))
-        FakeWeb.register_uri(:post, "http://localhost:3001/v2/search", :body => "1 2 3 4")
+        stub_request(:post, "http://localhost:3001/v2/search").to_return(:body => "1 2 3 4")
       end
 
       should "return a list of ids" do