Use File.expand_path in the spec requires so that the specs run on 1.9.2

jeremyevans · Jun 15, 2010 · 36eabe3 · 36eabe3
1 parent b05f2eb
commit 36eabe3
Show file tree

Hide file tree

Showing 92 changed files with 95 additions and 95 deletions.
diff --git a/spec/adapters/firebird_spec.rb b/spec/adapters/firebird_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 unless defined?(FIREBIRD_DB)
   FIREBIRD_URL = 'firebird://sysdba:masterkey@localhost/reality_spec' unless defined? FIREBIRD_URL

diff --git a/spec/adapters/informix_spec.rb b/spec/adapters/informix_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 unless defined?(INFORMIX_DB)
   INFORMIX_DB = Sequel.connect('informix://localhost/mydb')

diff --git a/spec/adapters/mssql_spec.rb b/spec/adapters/mssql_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 require ENV['SEQUEL_MSSQL_SPEC_REQUIRE'] if ENV['SEQUEL_MSSQL_SPEC_REQUIRE']
 

diff --git a/spec/adapters/mysql_spec.rb b/spec/adapters/mysql_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 unless defined?(MYSQL_USER)
   MYSQL_USER = 'root'

diff --git a/spec/adapters/oracle_spec.rb b/spec/adapters/oracle_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 unless defined?(ORACLE_DB)
   ORACLE_DB = Sequel.connect('oracle://hr:hr@localhost/XE')

diff --git a/spec/adapters/postgres_spec.rb b/spec/adapters/postgres_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 unless defined?(POSTGRES_DB)
   POSTGRES_URL = 'postgres://postgres:postgres@localhost:5432/reality_spec' unless defined? POSTGRES_URL

diff --git a/spec/adapters/spec_helper.rb b/spec/adapters/spec_helper.rb
@@ -1,12 +1,12 @@
 require 'rubygems'
 require 'logger'
 unless Object.const_defined?('Sequel')
-  $:.unshift(File.join(File.dirname(__FILE__), "../../lib/"))
+  $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
   require 'sequel'
   Sequel.quote_identifiers = false
 end
 begin
-  require File.join(File.dirname(File.dirname(__FILE__)), 'spec_config.rb')
+  require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'spec_config.rb')
 rescue LoadError
 end
 

diff --git a/spec/adapters/sqlite_spec.rb b/spec/adapters/sqlite_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 unless defined?(SQLITE_DB)
   SQLITE_URL = 'sqlite:/' unless defined? SQLITE_URL

diff --git a/spec/core/connection_pool_spec.rb b/spec/core/connection_pool_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 CONNECTION_POOL_DEFAULTS = {:pool_timeout=>5, :pool_sleep_time=>0.001, :max_connections=>4}
 
 context "An empty ConnectionPool" do

diff --git a/spec/core/core_sql_spec.rb b/spec/core/core_sql_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 context "Array#all_two_pairs?" do
   specify "should return false if empty" do

diff --git a/spec/core/database_spec.rb b/spec/core/database_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 context "A new Database" do
   before do

diff --git a/spec/core/dataset_spec.rb b/spec/core/dataset_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 context "Dataset" 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__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 Regexp.send(:include, Sequel::SQL::StringMethods)
 String.send(:include, Sequel::SQL::StringMethods)

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__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 describe Sequel::Dataset, " graphing" 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__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 describe Sequel::Schema::Generator 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__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 context "DB#create_table" do
   before do

diff --git a/spec/core/spec_helper.rb b/spec/core/spec_helper.rb
@@ -1,6 +1,6 @@
 require 'rubygems'
 unless Object.const_defined?('Sequel')
-  $:.unshift(File.join(File.dirname(__FILE__), "../../lib/"))
+  $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
   require 'sequel/core'
 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__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 context "Sequel.version" do
   specify "should be in the form X.Y.Z with all being numbers" 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__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 begin
   require 'active_model'

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__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "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__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "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__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel::Plugins::AssociationProxies" 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__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 context "Object#blank?" do
   specify "it should be true if the object responds true to empty?" do

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__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe Sequel::Model, "BooleanReaders 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__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "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__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "class_table_inheritance plugin" 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__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Composition plugin" do
   before do

diff --git a/spec/extensions/force_encoding_spec.rb b/spec/extensions/force_encoding_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 if RUBY_VERSION >= '1.9.0'
 describe "force_encoding plugin" do
   before do

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

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

diff --git a/spec/extensions/inflector_spec.rb b/spec/extensions/inflector_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 describe String do
   it "#camelize and #camelcase should transform the word to CamelCase" do

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

diff --git a/spec/extensions/instance_hooks_spec.rb b/spec/extensions/instance_hooks_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "InstanceHooks plugin" do
   def r(x)

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

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

diff --git a/spec/extensions/list_spec.rb b/spec/extensions/list_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '/spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), '/spec_helper')
 
 describe "List plugin" do
   def klass(opts={})

diff --git a/spec/extensions/looser_typecasting_spec.rb b/spec/extensions/looser_typecasting_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 context "LooserTypecasting Extension" do
   before do

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

diff --git a/spec/extensions/migration_spec.rb b/spec/extensions/migration_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 context "Migration.descendants" do
   before do

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

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

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

diff --git a/spec/extensions/pagination_spec.rb b/spec/extensions/pagination_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 context "A paginated dataset" do
   before do

diff --git a/spec/extensions/pretty_table_spec.rb b/spec/extensions/pretty_table_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 require 'stringio'
 

diff --git a/spec/extensions/query_spec.rb b/spec/extensions/query_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 context "Database#dataset" do
   before do

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

diff --git a/spec/extensions/schema_dumper_spec.rb b/spec/extensions/schema_dumper_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 describe "Sequel::Schema::Generator dump methods" do
   before do

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

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

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

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

diff --git a/spec/extensions/skip_create_refresh_spec.rb b/spec/extensions/skip_create_refresh_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel::Plugins::SkipCreateRefresh" do
   it "should skip the refresh after saving a new object" do

diff --git a/spec/extensions/spec_helper.rb b/spec/extensions/spec_helper.rb
@@ -1,10 +1,10 @@
 require 'rubygems'
 unless Object.const_defined?('Sequel')
-  $:.unshift(File.join(File.dirname(__FILE__), "../../lib/"))
+  $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
   require 'sequel/core'
 end
 unless Sequel.const_defined?('Model')
-  $:.unshift(File.join(File.dirname(__FILE__), "../../lib/"))
+  $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
   require 'sequel/model'
 end
 

diff --git a/spec/extensions/sql_expr_spec.rb b/spec/extensions/sql_expr_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 context "Sequel sql_expr extension" do
   specify "Object#sql_expr should wrap the object in a GenericComplexExpression" do

diff --git a/spec/extensions/string_date_time_spec.rb b/spec/extensions/string_date_time_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 context "String#to_time" do
   specify "should convert the string into a Time object" do

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

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

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

diff --git a/spec/extensions/thread_local_timezones_spec.rb b/spec/extensions/thread_local_timezones_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel thread_local_timezones extension" do
   after do

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

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

diff --git a/spec/extensions/tree_spec.rb b/spec/extensions/tree_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe Sequel::Model, "tree plugin" do
   def klass(opts={})

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