From a61ce039536c042d9b09f84ff98f1a1c20f7fdff Mon Sep 17 00:00:00 2001
From: d-m-u <16326669+d-m-u@users.noreply.github.com>
Date: Sat, 8 Feb 2020 08:43:02 -0500
Subject: [PATCH] Update faraday version in gemspec (#794)

* Update faraday version in gemspec

* Fix specs
---
 Gemfile.faraday-0.11 => Gemfile.faraday-1.0.0 |  2 +-
 script/ci.sh                                  |  2 +-
 spec/lib/vcr/library_hooks/faraday_spec.rb    | 28 ++-----------------
 spec/spec_helper.rb                           |  4 +--
 vcr.gemspec                                   |  2 +-
 5 files changed, 8 insertions(+), 30 deletions(-)
 rename Gemfile.faraday-0.11 => Gemfile.faraday-1.0.0 (77%)

diff --git a/Gemfile.faraday-0.11 b/Gemfile.faraday-1.0.0
similarity index 77%
rename from Gemfile.faraday-0.11
rename to Gemfile.faraday-1.0.0
index 7c1fd55c..c80d3139 100644
--- a/Gemfile.faraday-0.11
+++ b/Gemfile.faraday-1.0.0
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "faraday", "~> 0.11.0"
+gem "faraday", "~> 1.0.0"
 
 gemspec
 
diff --git a/script/ci.sh b/script/ci.sh
index 48fe454d..b78157a6 100755
--- a/script/ci.sh
+++ b/script/ci.sh
@@ -86,7 +86,7 @@ if [ "$RUBY_ENGINE" = "ruby" ]; then
     run script/test spec/lib/vcr/library_hooks/typhoeus_0.4_spec.rb
 fi
 
-BUNDLE_GEMFILE=Gemfile.faraday-0.11 fold "faraday-0.11" \
+BUNDLE_GEMFILE=Gemfile.faraday-1.0.0 fold "faraday-1.0.0" \
   run script/test spec/lib/vcr/middleware/faraday_spec.rb spec/lib/vcr/library_hooks/faraday_spec.rb \
     features/middleware/faraday.feature
 
diff --git a/spec/lib/vcr/library_hooks/faraday_spec.rb b/spec/lib/vcr/library_hooks/faraday_spec.rb
index e84e3575..c48177ba 100644
--- a/spec/lib/vcr/library_hooks/faraday_spec.rb
+++ b/spec/lib/vcr/library_hooks/faraday_spec.rb
@@ -10,45 +10,23 @@
     end
 
     conn.builder.lock!
-    expect(conn.builder.handlers.last(2).map(&:klass)).to eq([
-      VCR::Middleware::Faraday,
-      Faraday::Adapter::NetHttp
-    ])
+    expect(conn.builder.handlers.last.klass).to eq(VCR::Middleware::Faraday)
   end
 
   it 'handles the case where no adapter is declared' do
     conn = Faraday.new
 
     conn.builder.lock!
-    expect(conn.builder.handlers.last(2).map(&:klass)).to eq([
-      VCR::Middleware::Faraday,
-      Faraday::Adapter::NetHttp
-    ])
+    expect(conn.builder.handlers.last.klass).to eq(VCR::Middleware::Faraday)
   end
 
   it 'does nothing if the VCR middleware has already been included' do
     conn = Faraday.new(:url => 'http://sushi.com') do |builder|
       builder.use VCR::Middleware::Faraday
-      builder.use Faraday::Response::Logger
-      builder.use Faraday::Adapter::NetHttp
-    end
-
-    conn.builder.lock!
-    expect(conn.builder.handlers.map(&:klass)).to eq([
-      VCR::Middleware::Faraday,
-      Faraday::Response::Logger,
-      Faraday::Adapter::NetHttp
-    ])
-  end
-
-  it 'prints a warning if the faraday connection stack contains a middleware after the HTTP adapter' do
-    conn = Faraday.new(:url => 'http://sushi.com') do |builder|
-      builder.use Faraday::Adapter::NetHttp
-      builder.use Faraday::Response::Logger
     end
 
-    expect(conn.builder).to receive(:warn).with(/Faraday::Response::Logger/)
     conn.builder.lock!
+    expect(conn.builder.handlers).to eq([VCR::Middleware::Faraday])
   end
 
   it 'gracefully handles the case where there is no explicit HTTP adapter' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9edb6532..0863f359 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,5 +1,5 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
 require "pry"
 require "rspec"
diff --git a/vcr.gemspec b/vcr.gemspec
index 9f67461f..84adfafb 100644
--- a/vcr.gemspec
+++ b/vcr.gemspec
@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "hashdiff", ">= 1.0.0.beta1", "< 2.0.0"
   spec.add_development_dependency "cucumber", "~> 2.0.2"
   spec.add_development_dependency "aruba", "~> 0.14.12"
-  spec.add_development_dependency "faraday", "~> 0.11.0"
+  spec.add_development_dependency "faraday", ">= 0.11.0", "< 2.0.0"
   spec.add_development_dependency "httpclient"
   spec.add_development_dependency "excon", "0.62.0"
   spec.add_development_dependency "timecop"