Browse files

Use load path rather than relative path for spec_helper requires. Als…

…o fixes specs on Ruby 1.9 since . is no longer in the load path.
  • Loading branch information...
1 parent bad67f8 commit 7a7ee72ec1cb5a0b31d0ed9cd5c58a018876b65d @jeremy jeremy committed Sep 14, 2009
Showing with 54 additions and 53 deletions.
  1. +1 −0 Rakefile
  2. +1 −1 spec/arel/algebra/unit/predicates/binary_spec.rb
  3. +1 −1 spec/arel/algebra/unit/predicates/equality_spec.rb
  4. +1 −1 spec/arel/algebra/unit/predicates/in_spec.rb
  5. +1 −1 spec/arel/algebra/unit/primitives/attribute_spec.rb
  6. +1 −1 spec/arel/algebra/unit/primitives/expression_spec.rb
  7. +1 −1 spec/arel/algebra/unit/primitives/value_spec.rb
  8. +1 −1 spec/arel/algebra/unit/relations/alias_spec.rb
  9. +1 −1 spec/arel/algebra/unit/relations/delete_spec.rb
  10. +1 −1 spec/arel/algebra/unit/relations/group_spec.rb
  11. +1 −1 spec/arel/algebra/unit/relations/insert_spec.rb
  12. +1 −1 spec/arel/algebra/unit/relations/join_spec.rb
  13. +1 −1 spec/arel/algebra/unit/relations/order_spec.rb
  14. +1 −1 spec/arel/algebra/unit/relations/project_spec.rb
  15. +1 −1 spec/arel/algebra/unit/relations/relation_spec.rb
  16. +1 −1 spec/arel/algebra/unit/relations/skip_spec.rb
  17. +1 −1 spec/arel/algebra/unit/relations/table_spec.rb
  18. +1 −1 spec/arel/algebra/unit/relations/take_spec.rb
  19. +1 −1 spec/arel/algebra/unit/relations/update_spec.rb
  20. +1 −1 spec/arel/algebra/unit/relations/where_spec.rb
  21. +1 −1 spec/arel/algebra/unit/session/session_spec.rb
  22. +1 −1 spec/arel/engines/memory/integration/joins/cross_engine_spec.rb
  23. +1 −1 spec/arel/engines/memory/unit/relations/array_spec.rb
  24. +1 −1 spec/arel/engines/memory/unit/relations/insert_spec.rb
  25. +1 −1 spec/arel/engines/memory/unit/relations/join_spec.rb
  26. +1 −1 spec/arel/engines/memory/unit/relations/order_spec.rb
  27. +1 −1 spec/arel/engines/memory/unit/relations/project_spec.rb
  28. +1 −1 spec/arel/engines/memory/unit/relations/skip_spec.rb
  29. +1 −1 spec/arel/engines/memory/unit/relations/take_spec.rb
  30. +1 −1 spec/arel/engines/memory/unit/relations/where_spec.rb
  31. +1 −1 spec/arel/engines/sql/integration/joins/with_adjacency_spec.rb
  32. +1 −1 spec/arel/engines/sql/integration/joins/with_aggregations_spec.rb
  33. +1 −1 spec/arel/engines/sql/integration/joins/with_compounds_spec.rb
  34. +1 −1 spec/arel/engines/sql/unit/engine_spec.rb
  35. +1 −1 spec/arel/engines/sql/unit/predicates/binary_spec.rb
  36. +1 −1 spec/arel/engines/sql/unit/predicates/equality_spec.rb
  37. +1 −1 spec/arel/engines/sql/unit/predicates/in_spec.rb
  38. +1 −1 spec/arel/engines/sql/unit/predicates/predicates_spec.rb
  39. +1 −1 spec/arel/engines/sql/unit/primitives/attribute_spec.rb
  40. +1 −1 spec/arel/engines/sql/unit/primitives/expression_spec.rb
  41. +1 −1 spec/arel/engines/sql/unit/primitives/literal_spec.rb
  42. +1 −1 spec/arel/engines/sql/unit/primitives/value_spec.rb
  43. +1 −1 spec/arel/engines/sql/unit/relations/alias_spec.rb
  44. +1 −1 spec/arel/engines/sql/unit/relations/delete_spec.rb
  45. +1 −1 spec/arel/engines/sql/unit/relations/group_spec.rb
  46. +1 −1 spec/arel/engines/sql/unit/relations/insert_spec.rb
  47. +1 −1 spec/arel/engines/sql/unit/relations/join_spec.rb
  48. +1 −1 spec/arel/engines/sql/unit/relations/order_spec.rb
  49. +1 −1 spec/arel/engines/sql/unit/relations/project_spec.rb
  50. +1 −1 spec/arel/engines/sql/unit/relations/skip_spec.rb
  51. +1 −1 spec/arel/engines/sql/unit/relations/table_spec.rb
  52. +1 −1 spec/arel/engines/sql/unit/relations/take_spec.rb
  53. +1 −1 spec/arel/engines/sql/unit/relations/update_spec.rb
  54. +1 −1 spec/arel/engines/sql/unit/relations/where_spec.rb
View
1 Rakefile
@@ -21,6 +21,7 @@ namespace :spec do
desc "Run specs with the #{adapter} database adapter"
Spec::Rake::SpecTask.new(adapter) do |t|
t.libs << "#{File.dirname(__FILE__)}/vendor/rails/activerecord/lib"
+ t.libs << "#{File.dirname(__FILE__)}/spec"
t.spec_files =
["spec/connections/#{adapter}_connection.rb"] +
["spec/schemas/#{adapter}_schema.rb"] +
View
2 spec/arel/algebra/unit/predicates/binary_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Binary do
View
2 spec/arel/algebra/unit/predicates/equality_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Equality do
View
2 spec/arel/algebra/unit/predicates/in_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe In do
View
2 spec/arel/algebra/unit/primitives/attribute_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Attribute do
View
2 spec/arel/algebra/unit/primitives/expression_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Expression do
View
2 spec/arel/algebra/unit/primitives/value_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Value do
View
2 spec/arel/algebra/unit/relations/alias_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Alias do
View
2 spec/arel/algebra/unit/relations/delete_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Deletion do
View
2 spec/arel/algebra/unit/relations/group_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Group do
View
2 spec/arel/algebra/unit/relations/insert_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Insert do
View
2 spec/arel/algebra/unit/relations/join_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Join do
View
2 spec/arel/algebra/unit/relations/order_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Order do
View
2 spec/arel/algebra/unit/relations/project_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Project do
View
2 spec/arel/algebra/unit/relations/relation_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Relation do
View
2 spec/arel/algebra/unit/relations/skip_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Skip do
View
2 spec/arel/algebra/unit/relations/table_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Table do
View
2 spec/arel/algebra/unit/relations/take_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Take do
View
2 spec/arel/algebra/unit/relations/update_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Update do
View
2 spec/arel/algebra/unit/relations/where_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Where do
View
2 spec/arel/algebra/unit/session/session_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Session do
View
2 spec/arel/engines/memory/integration/joins/cross_engine_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Join do
View
2 spec/arel/engines/memory/unit/relations/array_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Array do
View
2 spec/arel/engines/memory/unit/relations/insert_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Insert do
View
2 spec/arel/engines/memory/unit/relations/join_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Join do
View
2 spec/arel/engines/memory/unit/relations/order_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Order do
View
2 spec/arel/engines/memory/unit/relations/project_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Project do
View
2 spec/arel/engines/memory/unit/relations/skip_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Skip do
View
2 spec/arel/engines/memory/unit/relations/take_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Take do
View
2 spec/arel/engines/memory/unit/relations/where_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Where do
View
2 spec/arel/engines/sql/integration/joins/with_adjacency_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Join do
View
2 spec/arel/engines/sql/integration/joins/with_aggregations_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Join do
View
2 spec/arel/engines/sql/integration/joins/with_compounds_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Join do
View
2 spec/arel/engines/sql/unit/engine_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Sql::Engine do
View
2 spec/arel/engines/sql/unit/predicates/binary_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Binary do
View
2 spec/arel/engines/sql/unit/predicates/equality_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Equality do
View
2 spec/arel/engines/sql/unit/predicates/in_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe In do
View
2 spec/arel/engines/sql/unit/predicates/predicates_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Predicate do
View
2 spec/arel/engines/sql/unit/primitives/attribute_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Attribute do
View
2 spec/arel/engines/sql/unit/primitives/expression_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Expression do
View
2 spec/arel/engines/sql/unit/primitives/literal_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe SqlLiteral do
View
2 spec/arel/engines/sql/unit/primitives/value_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Value do
View
2 spec/arel/engines/sql/unit/relations/alias_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Alias do
View
2 spec/arel/engines/sql/unit/relations/delete_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Deletion do
View
2 spec/arel/engines/sql/unit/relations/group_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Group do
View
2 spec/arel/engines/sql/unit/relations/insert_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Insert do
View
2 spec/arel/engines/sql/unit/relations/join_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Join do
View
2 spec/arel/engines/sql/unit/relations/order_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Order do
View
2 spec/arel/engines/sql/unit/relations/project_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Project do
View
2 spec/arel/engines/sql/unit/relations/skip_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Skip do
View
2 spec/arel/engines/sql/unit/relations/table_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Table do
View
2 spec/arel/engines/sql/unit/relations/take_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Take do
View
2 spec/arel/engines/sql/unit/relations/update_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
class User
def self.primary_key
View
2 spec/arel/engines/sql/unit/relations/where_spec.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
module Arel
describe Where do

0 comments on commit 7a7ee72

Please sign in to comment.