From 350d1538733a2e915632a56eedea958e099549c8 Mon Sep 17 00:00:00 2001 From: Zachary Herr Date: Mon, 27 Aug 2018 09:41:31 -0500 Subject: [PATCH] Make use of RSpec DSL consistent across specs --- spec/httparty/connection_adapter_spec.rb | 2 +- spec/httparty/cookie_hash_spec.rb | 2 +- spec/httparty/exception_spec.rb | 2 +- spec/httparty/hash_conversions_spec.rb | 2 ++ spec/httparty/logger/apache_formatter_spec.rb | 2 +- spec/httparty/logger/curl_formatter_spec.rb | 2 +- spec/httparty/logger/logger_spec.rb | 2 +- spec/httparty/net_digest_auth_spec.rb | 32 +++++++++---------- spec/httparty/parser_spec.rb | 2 +- spec/httparty/request/body_spec.rb | 3 +- spec/httparty/request_spec.rb | 2 +- spec/httparty/response_spec.rb | 32 +++++++++---------- spec/httparty/ssl_spec.rb | 2 +- spec/httparty_spec.rb | 4 +-- spec/spec_helper.rb | 2 -- 15 files changed, 46 insertions(+), 47 deletions(-) diff --git a/spec/httparty/connection_adapter_spec.rb b/spec/httparty/connection_adapter_spec.rb index e88be5e3..c7050540 100644 --- a/spec/httparty/connection_adapter_spec.rb +++ b/spec/httparty/connection_adapter_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper')) +require 'spec_helper' RSpec.describe HTTParty::ConnectionAdapter do describe "initialization" do diff --git a/spec/httparty/cookie_hash_spec.rb b/spec/httparty/cookie_hash_spec.rb index b8499cdb..76e1b76c 100644 --- a/spec/httparty/cookie_hash_spec.rb +++ b/spec/httparty/cookie_hash_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.join(File.dirname(__FILE__), '../spec_helper')) +require 'spec_helper' RSpec.describe HTTParty::CookieHash do before(:each) do diff --git a/spec/httparty/exception_spec.rb b/spec/httparty/exception_spec.rb index 42a1bce6..5d98b975 100644 --- a/spec/httparty/exception_spec.rb +++ b/spec/httparty/exception_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper')) +require 'spec_helper' RSpec.describe HTTParty::Error do subject { described_class } diff --git a/spec/httparty/hash_conversions_spec.rb b/spec/httparty/hash_conversions_spec.rb index 0027f252..23606dfe 100644 --- a/spec/httparty/hash_conversions_spec.rb +++ b/spec/httparty/hash_conversions_spec.rb @@ -1,3 +1,5 @@ +require 'spec_helper' + RSpec.describe HTTParty::HashConversions do describe ".to_params" do it "creates a params string from a hash" do diff --git a/spec/httparty/logger/apache_formatter_spec.rb b/spec/httparty/logger/apache_formatter_spec.rb index 3cc1d5b7..2f95cdba 100644 --- a/spec/httparty/logger/apache_formatter_spec.rb +++ b/spec/httparty/logger/apache_formatter_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')) +require 'spec_helper' RSpec.describe HTTParty::Logger::ApacheFormatter do let(:subject) { described_class.new(logger_double, :info) } diff --git a/spec/httparty/logger/curl_formatter_spec.rb b/spec/httparty/logger/curl_formatter_spec.rb index b3e54af5..ec89ee4f 100644 --- a/spec/httparty/logger/curl_formatter_spec.rb +++ b/spec/httparty/logger/curl_formatter_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')) +require 'spec_helper' RSpec.describe HTTParty::Logger::CurlFormatter do describe "#format" do diff --git a/spec/httparty/logger/logger_spec.rb b/spec/httparty/logger/logger_spec.rb index d4ccd2e9..cda53791 100644 --- a/spec/httparty/logger/logger_spec.rb +++ b/spec/httparty/logger/logger_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')) +require 'spec_helper' RSpec.describe HTTParty::Logger do describe ".build" do diff --git a/spec/httparty/net_digest_auth_spec.rb b/spec/httparty/net_digest_auth_spec.rb index fb1a3683..43912f2d 100644 --- a/spec/httparty/net_digest_auth_spec.rb +++ b/spec/httparty/net_digest_auth_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper')) +require 'spec_helper' RSpec.describe Net::HTTPHeader::DigestAuthenticator do def setup_digest(response) @@ -19,7 +19,7 @@ def cookie_header context 'Net::HTTPHeader#digest_auth' do let(:headers) { - (Class.new do + (Class.new do include Net::HTTPHeader def initialize @header = {} @@ -27,25 +27,25 @@ def initialize @method = 'GET' end end).new - } + } let(:response){ - (Class.new do + (Class.new do include Net::HTTPHeader def initialize @header = {} - self['WWW-Authenticate'] = + self['WWW-Authenticate'] = 'Digest realm="testrealm@host.com", qop="auth,auth-int", nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093", opaque="5ccc069c403ebaf9f0171e9517f40e41"' end end).new } - it 'should set the authorization header' do + it 'should set the authorization header' do expect(headers['authorization']).to be_nil headers.digest_auth('user','pass', response) expect(headers['authorization']).to_not be_empty - end - end + end + end context "with a cookie value in the response header" do before do @@ -228,18 +228,18 @@ def initialize expect(authorization_header).to include(%(response="#{request_digest}")) end end - + context "with algorithm specified" do before do @digest = setup_digest({ 'www-authenticate' => 'Digest realm="myhost@testrealm.com", nonce="NONCE", qop="auth", algorithm=MD5' }) end - + it "should recognise algorithm was specified" do expect( @digest.send :algorithm_present? ).to be(true) end - + it "should set the algorithm header" do expect(authorization_header).to include('algorithm="MD5"') end @@ -251,20 +251,20 @@ def initialize 'www-authenticate' => 'Digest realm="myhost@testrealm.com", nonce="NONCE", qop="auth", algorithm=MD5-sess' }) end - + it "should recognise algorithm was specified" do expect( @digest.send :algorithm_present? ).to be(true) end - + it "should set the algorithm header" do expect(authorization_header).to include('algorithm="MD5-sess"') end - + it "should set response using md5-sess algorithm" do request_digest = "md5(md5(md5(Mufasa:myhost@testrealm.com:Circle Of Life):NONCE:md5(deadbeef)):NONCE:00000001:md5(deadbeef):auth:md5(GET:/dir/index.html))" expect(authorization_header).to include(%(response="#{request_digest}")) end - + end - + end diff --git a/spec/httparty/parser_spec.rb b/spec/httparty/parser_spec.rb index fea816ae..e19f0859 100644 --- a/spec/httparty/parser_spec.rb +++ b/spec/httparty/parser_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper')) +require 'spec_helper' RSpec.describe HTTParty::Parser do describe ".SupportedFormats" do diff --git a/spec/httparty/request/body_spec.rb b/spec/httparty/request/body_spec.rb index 430a8ae7..5dcb0b7b 100644 --- a/spec/httparty/request/body_spec.rb +++ b/spec/httparty/request/body_spec.rb @@ -1,6 +1,7 @@ +require 'spec_helper' require 'tempfile' -describe HTTParty::Request::Body do +RSpec.describe HTTParty::Request::Body do describe '#call' do subject { described_class.new(params).call } diff --git a/spec/httparty/request_spec.rb b/spec/httparty/request_spec.rb index ec9205c0..e1ae9771 100644 --- a/spec/httparty/request_spec.rb +++ b/spec/httparty/request_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper')) +require 'spec_helper' RSpec.describe HTTParty::Request do before do diff --git a/spec/httparty/response_spec.rb b/spec/httparty/response_spec.rb index b9aff086..aca96947 100644 --- a/spec/httparty/response_spec.rb +++ b/spec/httparty/response_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper')) +require 'spec_helper' RSpec.describe HTTParty::Response do before do @@ -78,11 +78,11 @@ }.to raise_error(NameError, /HTTParty\:\:Response/) end - it 'does raise an error about itself when invoking a method that does not exist' do + it 'does raise an error about itself when invoking a method that does not exist' do expect { HTTParty::Response.new(@request_object, @response_object, @parsed_response).qux }.to raise_error(NoMethodError, /HTTParty\:\:Response/) - end + end it "returns response headers" do response = HTTParty::Response.new(@request_object, @response_object, @parsed_response) @@ -131,21 +131,21 @@ context 'response is array' do let(:response_value) { [{'foo' => 'bar'}, {'foo' => 'baz'}] } - let(:response) { HTTParty::Response.new(@request_object, @response_object, lambda { response_value }) } - it "should be able to iterate" do + let(:response) { HTTParty::Response.new(@request_object, @response_object, lambda { response_value }) } + it "should be able to iterate" do expect(response.size).to eq(2) expect { response.each { |item| } }.to_not raise_error end - it 'should respond to array methods' do - expect(response).to respond_to(:bsearch, :compact, :cycle, :delete, :each, :flatten, :flatten!, :compact, :join) + it 'should respond to array methods' do + expect(response).to respond_to(:bsearch, :compact, :cycle, :delete, :each, :flatten, :flatten!, :compact, :join) end it 'should equal the string response object body' do - expect(response.to_s).to eq(@response_object.body.to_s) - end + expect(response.to_s).to eq(@response_object.body.to_s) + end it 'should display the same as an array' do a = StringIO.new @@ -153,7 +153,7 @@ response_value.display(b) response.display(a) - expect(a.string).to eq(b.string) + expect(a.string).to eq(b.string) end end @@ -294,27 +294,27 @@ def response_mock(klass) describe "headers" do let (:empty_headers) { HTTParty::Response::Headers.new } - let (:some_headers_hash) do + let (:some_headers_hash) do {'Cookie' => 'bob', 'Content-Encoding' => 'meow'} - end - let (:some_headers) do + end + let (:some_headers) do HTTParty::Response::Headers.new.tap do |h| some_headers_hash.each_pair do |k,v| h[k] = v end end end - it "can initialize without headers" do + it "can initialize without headers" do expect(empty_headers).to eq({}) end it 'always equals itself' do - expect(empty_headers).to eq(empty_headers) + expect(empty_headers).to eq(empty_headers) expect(some_headers).to eq(some_headers) end - it 'does not equal itself when not equivalent' do + it 'does not equal itself when not equivalent' do expect(empty_headers).to_not eq(some_headers) end diff --git a/spec/httparty/ssl_spec.rb b/spec/httparty/ssl_spec.rb index 1f77930c..b6c081f8 100644 --- a/spec/httparty/ssl_spec.rb +++ b/spec/httparty/ssl_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper')) +require 'spec_helper' RSpec.describe HTTParty::Request do context "SSL certificate verification" do diff --git a/spec/httparty_spec.rb b/spec/httparty_spec.rb index 71d174f6..7ba50553 100644 --- a/spec/httparty_spec.rb +++ b/spec/httparty_spec.rb @@ -1,6 +1,4 @@ -require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper')) - -describe HTTParty do +RSpec.describe HTTParty do before(:each) do @klass = Class.new @klass.instance_eval { include HTTParty } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 8c941feb..d8622a46 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -38,8 +38,6 @@ def file_fixture(filename) config.order = :random Kernel.srand config.seed - - config.expose_dsl_globally = true end RSpec::Matchers.define :use_ssl do