Use require_relative in the specs

jeremyevans · Aug 1, 2017 · 53fc0fc · 53fc0fc
1 parent e6aa365
commit 53fc0fc
Show file tree

Hide file tree

Showing 187 changed files with 210 additions and 213 deletions.
diff --git a/spec/adapter_spec.rb b/spec/adapter_spec.rb
@@ -1,4 +1,4 @@
 if !ARGV.empty? && ARGV.first != 'none'
-  require "./spec/adapters/#{ARGV.first}_spec.rb"
+  require_relative "adapters/#{ARGV.first}_spec"
 end
 Dir['./spec/integration/*_test.rb'].each{|f| require f}
diff --git a/spec/adapters/db2_spec.rb b/spec/adapters/db2_spec.rb
@@ -1,6 +1,6 @@
 SEQUEL_ADAPTER_TEST = :db2
 
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require_relative 'spec_helper'
 
 if DB.table_exists?(:test)
   DB.drop_table(:test)

diff --git a/spec/adapters/mssql_spec.rb b/spec/adapters/mssql_spec.rb
@@ -1,6 +1,6 @@
 SEQUEL_ADAPTER_TEST = :mssql
 
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require_relative 'spec_helper'
 
 def DB.sqls
   (@sqls ||= [])

diff --git a/spec/adapters/mysql_spec.rb b/spec/adapters/mysql_spec.rb
@@ -1,6 +1,6 @@
 SEQUEL_ADAPTER_TEST = :mysql
 
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require_relative 'spec_helper'
 
 unless defined?(MYSQL_SOCKET_FILE)
   MYSQL_SOCKET_FILE = '/tmp/mysql.sock'

diff --git a/spec/adapters/oracle_spec.rb b/spec/adapters/oracle_spec.rb
@@ -1,6 +1,6 @@
 SEQUEL_ADAPTER_TEST = :oracle
 
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require_relative 'spec_helper'
 
 unless DB.opts[:autosequence]
   warn "Running oracle adapter specs without :autosequence Database option results in many errors, use the :autosequence Database option when testing"

diff --git a/spec/adapters/postgres_spec.rb b/spec/adapters/postgres_spec.rb
@@ -1,6 +1,6 @@
 SEQUEL_ADAPTER_TEST = :postgres
 
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require_relative 'spec_helper'
 
 uses_pg = Sequel::Postgres::USES_PG if DB.adapter_scheme == :postgres
 uses_pg_or_jdbc = uses_pg || DB.adapter_scheme == :jdbc
@@ -3716,8 +3716,6 @@ class Company < Sequel::Model(:company)
 
 describe "PostgreSQL stored procedures for datasets" do
   before do
-    require 'sequel/adapters/utils/stored_procedures'
-
     @db = DB
     @db.create_table!(:items) do
       primary_key :id

diff --git a/spec/adapters/spec_helper.rb b/spec/adapters/spec_helper.rb
@@ -1,17 +1,17 @@
 require 'logger'
-require "#{File.dirname(File.dirname(__FILE__))}/sequel_warning.rb"
+require_relative "../sequel_warning"
 
 if ENV['COVERAGE']
-  require File.join(File.dirname(File.expand_path(__FILE__)), "../sequel_coverage")
+  require_relative "../sequel_coverage"
   SimpleCov.sequel_coverage(:group=>%r{lib/sequel/adapters})
 end
 
 unless Object.const_defined?('Sequel')
   $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
-  require 'sequel'
+  require_relative "../../lib/sequel"
 end
 begin
-  require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'spec_config.rb')
+  require_relative "../spec_config"
 rescue LoadError
 end
 
@@ -28,7 +28,7 @@ def log_duration(duration, message)
   end
 end
 
-require './spec/guards_helper'
+require_relative '../guards_helper'
 
 class Minitest::HooksSpec
   def check_sqls

diff --git a/spec/adapters/sqlanywhere_spec.rb b/spec/adapters/sqlanywhere_spec.rb
@@ -1,6 +1,6 @@
 SEQUEL_ADAPTER_TEST = :sqlanywhere
 
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require_relative 'spec_helper'
 
 describe "convert_smallint_to_bool" do
   before do

diff --git a/spec/adapters/sqlite_spec.rb b/spec/adapters/sqlite_spec.rb
@@ -1,6 +1,6 @@
 SEQUEL_ADAPTER_TEST = :sqlite
 
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require_relative 'spec_helper'
 
 describe "An SQLite database" do
   before do

diff --git a/spec/bin_spec.rb b/spec/bin_spec.rb
@@ -16,8 +16,7 @@
 end
 
 unless Object.const_defined?('Sequel') && Sequel.const_defined?('Model')
-  $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
-  require 'sequel'
+  require_relative '../lib/sequel'
 end
 
 File.delete(BIN_SPEC_DB) if File.file?(BIN_SPEC_DB)

diff --git a/spec/core/connection_pool_spec.rb b/spec/core/connection_pool_spec.rb
@@ -1,6 +1,6 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
+require_relative '../../lib/sequel/connection_pool/sharded_threaded'
 
-require 'sequel/connection_pool/sharded_threaded'
 connection_pool_defaults = {:pool_timeout=>5, :max_connections=>4}
 st_connection_pool_defaults = connection_pool_defaults.merge(:single_threaded=>true)
 

diff --git a/spec/core/database_spec.rb b/spec/core/database_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 describe "A new Database" do
   before do
@@ -1317,7 +1317,7 @@ def @db.ret_commit
 
 describe "A Database adapter with a scheme" do
   before do
-    require 'sequel/adapters/mock'
+    require_relative '../../lib/sequel/adapters/mock'
     @ccc = Class.new(Sequel::Mock::Database)
     @ccc.send(:set_adapter_scheme, :ccc)
   end

diff --git a/spec/core/dataset_spec.rb b/spec/core/dataset_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Dataset" do
   before do

diff --git a/spec/core/deprecated_spec.rb b/spec/core/deprecated_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 describe "Sequel::Deprecated" do
   before do

diff --git a/spec/core/expression_filters_spec.rb b/spec/core/expression_filters_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 describe "Blockless Ruby Filters" do
   before do

diff --git a/spec/core/mock_adapter_spec.rb b/spec/core/mock_adapter_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel Mock Adapter" do
   it "should have an adapter method" do

diff --git a/spec/core/object_graph_spec.rb b/spec/core/object_graph_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 describe Sequel::Dataset, "graphing" do
   before do

diff --git a/spec/core/placeholder_literalizer_spec.rb b/spec/core/placeholder_literalizer_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Dataset::PlaceholderLiteralizer" do
   before do

diff --git a/spec/core/schema_generator_spec.rb b/spec/core/schema_generator_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 describe Sequel::Schema::CreateTableGenerator do
   before do

diff --git a/spec/core/schema_spec.rb b/spec/core/schema_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 describe "DB#create_table" do
   before do

diff --git a/spec/core/spec_helper.rb b/spec/core/spec_helper.rb
@@ -1,25 +1,25 @@
-require "#{File.dirname(File.dirname(__FILE__))}/sequel_warning.rb"
+require_relative "../sequel_warning"
 
 if ENV['COVERAGE']
-  require File.join(File.dirname(File.expand_path(__FILE__)), "../sequel_coverage")
+  require_relative "../sequel_coverage"
   SimpleCov.sequel_coverage(:filter=>%r{lib/sequel/(\w+\.rb|(dataset|database|model|connection_pool)/\w+\.rb|adapters/mock\.rb)\z})
 end
 
 unless Object.const_defined?('Sequel')
   $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
-  require 'sequel/core'
+  require_relative "../../lib/sequel/core"
 end
 
 gem 'minitest'
 require 'minitest/autorun'
 require 'minitest/hooks/default'
 require 'minitest/shared_description'
 
-require "#{File.dirname(File.dirname(__FILE__))}/deprecation_helper.rb"
+require_relative '../deprecation_helper'
 
 if ENV['SEQUEL_COLUMNS_INTROSPECTION']
   Sequel.extension :columns_introspection
   Sequel::Database.extension :columns_introspection
-  Sequel.require 'adapters/mock'
+  require_relative '../../lib/sequel/adapters/mock'
   Sequel::Mock::Dataset.send(:include, Sequel::ColumnsIntrospection)
 end
diff --git a/spec/core/version_spec.rb b/spec/core/version_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 describe "Sequel.version" do
   it "should be in the form X.Y.Z with all being numbers" do

diff --git a/spec/core_extensions_spec.rb b/spec/core_extensions_spec.rb
@@ -1,11 +1,11 @@
 if ENV['COVERAGE']
-  require File.join(File.dirname(File.expand_path(__FILE__)), "sequel_coverage")
+  require_relative "sequel_coverage"
   SimpleCov.sequel_coverage(:filter=>%r{lib/sequel/extensions/core_extensions\.rb\z})
 end
 
 unless Object.const_defined?('Sequel') && Sequel.const_defined?('Model')
   $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../lib/"))
-  require 'sequel'
+  require_relative '../lib/sequel'
 end
 
 Regexp.send(:include, Sequel::SQL::StringMethods)
@@ -18,7 +18,7 @@
 require 'minitest/autorun'
 require 'minitest/hooks/default'
 
-require File.expand_path("#{File.dirname(__FILE__)}/deprecation_helper.rb")
+require_relative "deprecation_helper.rb"
 
 describe "Sequel core extensions" do
   it "should have Sequel.core_extensions? be true if enabled" do

diff --git a/spec/core_model_spec.rb b/spec/core_model_spec.rb
@@ -1,2 +1,2 @@
-require './spec/core_spec'
-require './spec/model_spec'
+require_relative 'core_spec'
+require_relative 'model_spec'
diff --git a/spec/extensions/accessed_columns_spec.rb b/spec/extensions/accessed_columns_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "accessed_columns plugin" do
   before do

diff --git a/spec/extensions/active_model_spec.rb b/spec/extensions/active_model_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 begin
   require 'active_model'

diff --git a/spec/extensions/after_initialize_spec.rb b/spec/extensions/after_initialize_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::AfterInitialize" do
   before do

diff --git a/spec/extensions/arbitrary_servers_spec.rb b/spec/extensions/arbitrary_servers_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "arbtirary servers" do
   before do

diff --git a/spec/extensions/association_dependencies_spec.rb b/spec/extensions/association_dependencies_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "AssociationDependencies plugin" do
   before do

diff --git a/spec/extensions/association_pks_spec.rb b/spec/extensions/association_pks_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::AssociationPks" do
   before do

diff --git a/spec/extensions/association_proxies_spec.rb b/spec/extensions/association_proxies_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::AssociationProxies" do
   before do

diff --git a/spec/extensions/auto_literal_strings_spec.rb b/spec/extensions/auto_literal_strings_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Dataset#where" do
   before do

diff --git a/spec/extensions/auto_validations_spec.rb b/spec/extensions/auto_validations_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::AutoValidations" do
   before do

diff --git a/spec/extensions/blacklist_security_spec.rb b/spec/extensions/blacklist_security_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe Sequel::Model, "#(set|update)_except" do
   before do

diff --git a/spec/extensions/blank_spec.rb b/spec/extensions/blank_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 Sequel.extension :blank
 

diff --git a/spec/extensions/boolean_readers_spec.rb b/spec/extensions/boolean_readers_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe Sequel::Model, "BooleanReaders plugin" do
   before do

diff --git a/spec/extensions/boolean_subsets_spec.rb b/spec/extensions/boolean_subsets_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "boolean_subsets plugin" do
   before do

diff --git a/spec/extensions/caching_spec.rb b/spec/extensions/caching_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe Sequel::Model, "caching" do
   before do

diff --git a/spec/extensions/class_table_inheritance_spec.rb b/spec/extensions/class_table_inheritance_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "class_table_inheritance plugin" do
   before do

diff --git a/spec/extensions/column_conflicts_spec.rb b/spec/extensions/column_conflicts_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "column_conflicts plugin" do
   before do

diff --git a/spec/extensions/column_select_spec.rb b/spec/extensions/column_select_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::ColumnSelect" do
   def set_cols(*cols)

diff --git a/spec/extensions/columns_introspection_spec.rb b/spec/extensions/columns_introspection_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 Sequel.extension :columns_introspection
 

diff --git a/spec/extensions/columns_updated_spec.rb b/spec/extensions/columns_updated_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::ColumnsUpdated" do
   before do

diff --git a/spec/extensions/composition_spec.rb b/spec/extensions/composition_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Composition plugin" do
   before do

diff --git a/spec/extensions/connection_expiration_spec.rb b/spec/extensions/connection_expiration_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 connection_expiration_specs = shared_description do
   describe "connection expiration" do

diff --git a/spec/extensions/connection_validator_spec.rb b/spec/extensions/connection_validator_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 connection_validator_specs = shared_description do
   describe "connection validator" do

diff --git a/spec/extensions/constraint_validations_plugin_spec.rb b/spec/extensions/constraint_validations_plugin_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::ConstraintValidations" do
   def model_class(opts={})

diff --git a/spec/extensions/constraint_validations_spec.rb b/spec/extensions/constraint_validations_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "constraint_validations extension" do
   def parse_insert(s)

diff --git a/spec/extensions/core_refinements_spec.rb b/spec/extensions/core_refinements_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 if (RUBY_VERSION >= '2.0.0' && RUBY_ENGINE == 'ruby') # || (RUBY_VERSION >= '2.3.0' && RUBY_ENGINE == 'jruby')
 Sequel.extension :core_refinements, :pg_array, :pg_hstore, :pg_row, :pg_range, :pg_row_ops, :pg_range_ops, :pg_array_ops, :pg_hstore_ops, :pg_json, :pg_json_ops