Permalink
Browse files

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

  • Loading branch information...
1 parent b05f2eb commit 36eabe31d10f0e9ee71ce1063852939807f446ea @jeremyevans jeremyevans committed Jun 15, 2010
Showing with 95 additions and 95 deletions.
  1. +1 −1 spec/adapters/firebird_spec.rb
  2. +1 −1 spec/adapters/informix_spec.rb
  3. +1 −1 spec/adapters/mssql_spec.rb
  4. +1 −1 spec/adapters/mysql_spec.rb
  5. +1 −1 spec/adapters/oracle_spec.rb
  6. +1 −1 spec/adapters/postgres_spec.rb
  7. +2 −2 spec/adapters/spec_helper.rb
  8. +1 −1 spec/adapters/sqlite_spec.rb
  9. +1 −1 spec/core/connection_pool_spec.rb
  10. +1 −1 spec/core/core_sql_spec.rb
  11. +1 −1 spec/core/database_spec.rb
  12. +1 −1 spec/core/dataset_spec.rb
  13. +1 −1 spec/core/expression_filters_spec.rb
  14. +1 −1 spec/core/object_graph_spec.rb
  15. +1 −1 spec/core/schema_generator_spec.rb
  16. +1 −1 spec/core/schema_spec.rb
  17. +1 −1 spec/core/spec_helper.rb
  18. +1 −1 spec/core/version_spec.rb
  19. +1 −1 spec/extensions/active_model_spec.rb
  20. +1 −1 spec/extensions/association_dependencies_spec.rb
  21. +1 −1 spec/extensions/association_pks_spec.rb
  22. +1 −1 spec/extensions/association_proxies_spec.rb
  23. +1 −1 spec/extensions/blank_spec.rb
  24. +1 −1 spec/extensions/boolean_readers_spec.rb
  25. +1 −1 spec/extensions/caching_spec.rb
  26. +1 −1 spec/extensions/class_table_inheritance_spec.rb
  27. +1 −1 spec/extensions/composition_spec.rb
  28. +1 −1 spec/extensions/force_encoding_spec.rb
  29. +1 −1 spec/extensions/hook_class_methods_spec.rb
  30. +1 −1 spec/extensions/identity_map_spec.rb
  31. +1 −1 spec/extensions/inflector_spec.rb
  32. +1 −1 spec/extensions/instance_filters_spec.rb
  33. +1 −1 spec/extensions/instance_hooks_spec.rb
  34. +1 −1 spec/extensions/json_serializer_spec.rb
  35. +1 −1 spec/extensions/lazy_attributes_spec.rb
  36. +1 −1 spec/extensions/list_spec.rb
  37. +1 −1 spec/extensions/looser_typecasting_spec.rb
  38. +1 −1 spec/extensions/many_through_many_spec.rb
  39. +1 −1 spec/extensions/migration_spec.rb
  40. +1 −1 spec/extensions/named_timezones_spec.rb
  41. +1 −1 spec/extensions/nested_attributes_spec.rb
  42. +1 −1 spec/extensions/optimistic_locking_spec.rb
  43. +1 −1 spec/extensions/pagination_spec.rb
  44. +1 −1 spec/extensions/pretty_table_spec.rb
  45. +1 −1 spec/extensions/query_spec.rb
  46. +1 −1 spec/extensions/rcte_tree_spec.rb
  47. +1 −1 spec/extensions/schema_dumper_spec.rb
  48. +1 −1 spec/extensions/schema_spec.rb
  49. +1 −1 spec/extensions/serialization_spec.rb
  50. +1 −1 spec/extensions/sharding_spec.rb
  51. +1 −1 spec/extensions/single_table_inheritance_spec.rb
  52. +1 −1 spec/extensions/skip_create_refresh_spec.rb
  53. +2 −2 spec/extensions/spec_helper.rb
  54. +1 −1 spec/extensions/sql_expr_spec.rb
  55. +1 −1 spec/extensions/string_date_time_spec.rb
  56. +1 −1 spec/extensions/string_stripper_spec.rb
  57. +1 −1 spec/extensions/subclasses_spec.rb
  58. +1 −1 spec/extensions/tactical_eager_loading_spec.rb
  59. +1 −1 spec/extensions/thread_local_timezones_spec.rb
  60. +1 −1 spec/extensions/timestamps_spec.rb
  61. +1 −1 spec/extensions/touch_spec.rb
  62. +1 −1 spec/extensions/tree_spec.rb
  63. +1 −1 spec/extensions/typecast_on_load_spec.rb
  64. +1 −1 spec/extensions/update_primary_key_spec.rb
  65. +1 −1 spec/extensions/validation_class_methods_spec.rb
  66. +1 −1 spec/extensions/validation_helpers_spec.rb
  67. +1 −1 spec/extensions/xml_serializer_spec.rb
  68. +1 −1 spec/integration/associations_test.rb
  69. +1 −1 spec/integration/database_test.rb
  70. +1 −1 spec/integration/dataset_test.rb
  71. +1 −1 spec/integration/eager_loader_test.rb
  72. +1 −1 spec/integration/migrator_test.rb
  73. +1 −1 spec/integration/model_test.rb
  74. +1 −1 spec/integration/plugin_test.rb
  75. +1 −1 spec/integration/prepared_statement_test.rb
  76. +1 −1 spec/integration/schema_test.rb
  77. +1 −1 spec/integration/spec_helper.rb
  78. +1 −1 spec/integration/timezone_test.rb
  79. +1 −1 spec/integration/transaction_test.rb
  80. +1 −1 spec/integration/type_test.rb
  81. +1 −1 spec/model/association_reflection_spec.rb
  82. +1 −1 spec/model/associations_spec.rb
  83. +1 −1 spec/model/base_spec.rb
  84. +1 −1 spec/model/dataset_methods_spec.rb
  85. +1 −1 spec/model/eager_loading_spec.rb
  86. +1 −1 spec/model/hooks_spec.rb
  87. +1 −1 spec/model/inflector_spec.rb
  88. +1 −1 spec/model/model_spec.rb
  89. +1 −1 spec/model/plugins_spec.rb
  90. +1 −1 spec/model/record_spec.rb
  91. +2 −2 spec/model/spec_helper.rb
  92. +1 −1 spec/model/validations_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
@@ -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')
@@ -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']
@@ -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'
@@ -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')
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
@@ -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
@@ -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
View
@@ -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
View
@@ -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
@@ -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
@@ -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'
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
@@ -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'
@@ -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
@@ -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={})
@@ -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
@@ -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
@@ -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
@@ -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'
@@ -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
@@ -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
@@ -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
@@ -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'
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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={})
@@ -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
Oops, something went wrong.

0 comments on commit 36eabe3

Please sign in to comment.