Make use of RSpec DSL consistent across specs

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

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

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 }

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

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) }

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

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

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)

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

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 }
 

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

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

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

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 }

spec/spec_helper.rb

@@ -38,8 +38,6 @@ RSpec.configure do |config|
   config.order = :random
 
   Kernel.srand config.seed
-
-  config.expose_dsl_globally = true
 end
 
 RSpec::Matchers.define :use_ssl do