From f8f1548fd4e672be9e656841f8ee98f19c86e62e Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Fri, 26 May 2017 13:04:25 +0800
Subject: [PATCH] Revert "FIX: Use Excon to do its own stubbing"

This reverts commit 80af54460a81bf1593cacb1f0b23e0e0a42c8076.
---
 spec/components/final_destination_spec.rb | 23 +++++++++++++----------
 spec/rails_helper.rb                      |  5 -----
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/spec/components/final_destination_spec.rb b/spec/components/final_destination_spec.rb
index 29ff9bd3bfc..302f5ff8ee5 100644
--- a/spec/components/final_destination_spec.rb
+++ b/spec/components/final_destination_spec.rb
@@ -28,7 +28,10 @@ describe FinalDestination do
   end
 
   def redirect_response(from, dest)
-    Excon.stub({ method: :head, hostname: from }, { status: 302, headers: { "Location" => dest } })
+    stub_request(:head, from).to_return(
+      status: 302,
+      headers: { "Location" => dest }
+    )
   end
 
   def fd(url)
@@ -48,7 +51,7 @@ describe FinalDestination do
 
     context "without redirects" do
       before do
-        Excon.stub({ method: :head, hostname: 'eviltrout.com' }, doc_response)
+        stub_request(:head, "https://eviltrout.com").to_return(doc_response)
       end
 
       it "returns the final url" do
@@ -74,9 +77,9 @@ describe FinalDestination do
 
     context "with a couple of redirects" do
       before do
-        redirect_response("eviltrout.com", "https://codinghorror.com/blog")
-        redirect_response("codinghorror.com", "https://discourse.org")
-        Excon.stub({ method: :head, hostname: 'discourse.org' }, doc_response)
+        redirect_response("https://eviltrout.com", "https://codinghorror.com/blog")
+        redirect_response("https://codinghorror.com/blog", "https://discourse.org")
+        stub_request(:head, "https://discourse.org").to_return(doc_response)
       end
 
       it "returns the final url" do
@@ -89,9 +92,9 @@ describe FinalDestination do
 
     context "with too many redirects" do
       before do
-        redirect_response("eviltrout.com", "https://codinghorror.com/blog")
-        redirect_response("codinghorror.com", "https://discourse.org")
-        Excon.stub({ method: :head, hostname: 'discourse.org' }, doc_response)
+        redirect_response("https://eviltrout.com", "https://codinghorror.com/blog")
+        redirect_response("https://codinghorror.com/blog", "https://discourse.org")
+        stub_request(:head, "https://discourse.org").to_return(doc_response)
       end
 
       it "returns the final url" do
@@ -104,8 +107,8 @@ describe FinalDestination do
 
     context "with a redirect to an internal IP" do
       before do
-        redirect_response("eviltrout.com", "https://private-host.com")
-        Excon.stub({ method: :head, hostname: 'private-host.com' }, doc_response)
+        redirect_response("https://eviltrout.com", "https://private-host.com")
+        stub_request(:head, "https://private-host.com").to_return(doc_response)
       end
 
       it "returns the final url" do
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 27c8b06800a..e6ed08fb571 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -124,12 +124,7 @@ Spork.prefork do
       Discourse.clear_readonly!
 
       I18n.locale = :en
-      Excon.defaults[:mock] = true
-    end
-
-    config.after(:each) do
       WebMock.reset!
-      Excon.stubs.clear
     end
 
     class TestCurrentUserProvider < Auth::DefaultCurrentUserProvider