From 5b2d51d54ca4d61662d624db0bd1a9b604aa70d6 Mon Sep 17 00:00:00 2001 From: iMacTia Date: Fri, 8 Mar 2019 16:25:23 +0000 Subject: [PATCH 1/3] Expose relevant specs to external adapters --- faraday.gemspec | 3 ++- spec/external_adapters/faraday_specs_setup.rb | 14 ++++++++++++++ spec/spec_helper.rb | 13 ------------- spec/support/disabling_stub.rb | 12 ++++++++++++ 4 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 spec/external_adapters/faraday_specs_setup.rb create mode 100644 spec/support/disabling_stub.rb diff --git a/faraday.gemspec b/faraday.gemspec index c52efabc1..53b4a409a 100644 --- a/faraday.gemspec +++ b/faraday.gemspec @@ -20,5 +20,6 @@ Gem::Specification.new do |spec| spec.add_dependency 'multipart-post', '>= 1.2', '< 3' - spec.files = `git ls-files -z lib LICENSE.md README.md`.split("\0") + spec.require_paths = %w[lib spec/external_adapters] + spec.files = `git ls-files -z lib spec/external_adapters LICENSE.md README.md`.split("\0") end diff --git a/spec/external_adapters/faraday_specs_setup.rb b/spec/external_adapters/faraday_specs_setup.rb new file mode 100644 index 000000000..0d3c746be --- /dev/null +++ b/spec/external_adapters/faraday_specs_setup.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +require 'webmock/rspec' +WebMock.disable_net_connect!(allow_localhost: true) + +require_relative '../support/helper_methods' +require_relative '../support/disabling_stub' +require_relative '../support/streaming_response_checker' +require_relative '../support/shared_examples/adapter' +require_relative '../support/shared_examples/request_method' + +RSpec.configure do |config| + config.include Faraday::HelperMethods +end \ No newline at end of file diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d611e7098..876176483 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -130,16 +130,3 @@ def dump_pending(_arg); end RSpec::Core::Formatters::DocumentationFormatter.prepend self end - -# Allows to disable WebMock stubs -module DisablingStub - def disable - @disabled = true - end - - def disabled? - @disabled - end - - WebMock::RequestStub.prepend self -end diff --git a/spec/support/disabling_stub.rb b/spec/support/disabling_stub.rb new file mode 100644 index 000000000..227c5b466 --- /dev/null +++ b/spec/support/disabling_stub.rb @@ -0,0 +1,12 @@ +# Allows to disable WebMock stubs +module DisablingStub + def disable + @disabled = true + end + + def disabled? + @disabled + end + + WebMock::RequestStub.prepend self +end \ No newline at end of file From 292980f69f693cb1add071606ce41715f23815aa Mon Sep 17 00:00:00 2001 From: iMacTia Date: Fri, 8 Mar 2019 16:26:33 +0000 Subject: [PATCH 2/3] FIxes Rubocop offenses --- spec/external_adapters/faraday_specs_setup.rb | 2 +- spec/support/disabling_stub.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spec/external_adapters/faraday_specs_setup.rb b/spec/external_adapters/faraday_specs_setup.rb index 0d3c746be..ac7f7b643 100644 --- a/spec/external_adapters/faraday_specs_setup.rb +++ b/spec/external_adapters/faraday_specs_setup.rb @@ -11,4 +11,4 @@ RSpec.configure do |config| config.include Faraday::HelperMethods -end \ No newline at end of file +end diff --git a/spec/support/disabling_stub.rb b/spec/support/disabling_stub.rb index 227c5b466..3df2f21b6 100644 --- a/spec/support/disabling_stub.rb +++ b/spec/support/disabling_stub.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Allows to disable WebMock stubs module DisablingStub def disable @@ -9,4 +11,4 @@ def disabled? end WebMock::RequestStub.prepend self -end \ No newline at end of file +end From 238e3057a29d027db917eb6d99819f5c1c7cb626 Mon Sep 17 00:00:00 2001 From: iMacTia Date: Sat, 9 Mar 2019 11:17:44 +0000 Subject: [PATCH 3/3] FIxes Rubocop offense in gemspec --- faraday.gemspec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/faraday.gemspec b/faraday.gemspec index 53b4a409a..b684baac0 100644 --- a/faraday.gemspec +++ b/faraday.gemspec @@ -21,5 +21,6 @@ Gem::Specification.new do |spec| spec.add_dependency 'multipart-post', '>= 1.2', '< 3' spec.require_paths = %w[lib spec/external_adapters] - spec.files = `git ls-files -z lib spec/external_adapters LICENSE.md README.md`.split("\0") + spec.files = `git ls-files -z lib spec/external_adapters`.split("\0") + spec.files += %w[LICENSE.md README.md] end