diff options
Diffstat (limited to 'spec')
-rw-r--r-- | spec/arel/unit/predicates/binary_spec.rb (renamed from spec/active_relation/unit/predicates/binary_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/predicates/equality_spec.rb (renamed from spec/active_relation/unit/predicates/equality_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/predicates/in_spec.rb (renamed from spec/active_relation/unit/predicates/in_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/primitives/attribute_spec.rb (renamed from spec/active_relation/unit/primitives/attribute_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/primitives/expression_spec.rb (renamed from spec/active_relation/unit/primitives/expression_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/primitives/value_spec.rb (renamed from spec/active_relation/unit/primitives/value_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/relations/alias_spec.rb (renamed from spec/active_relation/unit/relations/alias_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/relations/compound_spec.rb (renamed from spec/active_relation/unit/relations/compound_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/relations/deletion_spec.rb (renamed from spec/active_relation/unit/relations/deletion_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/relations/grouping_spec.rb (renamed from spec/active_relation/unit/relations/grouping_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/relations/insertion_spec.rb (renamed from spec/active_relation/unit/relations/insertion_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/relations/join_spec.rb (renamed from spec/active_relation/unit/relations/join_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/relations/order_spec.rb (renamed from spec/active_relation/unit/relations/order_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/relations/projection_spec.rb (renamed from spec/active_relation/unit/relations/projection_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/relations/relation_spec.rb (renamed from spec/active_relation/unit/relations/relation_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/relations/selection_spec.rb (renamed from spec/active_relation/unit/relations/selection_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/relations/skip_spec.rb (renamed from spec/active_relation/unit/relations/skip_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/relations/table_spec.rb (renamed from spec/active_relation/unit/relations/table_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/relations/take_spec.rb (renamed from spec/active_relation/unit/relations/take_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/relations/update_spec.rb (renamed from spec/active_relation/unit/relations/update_spec.rb) | 2 | ||||
-rw-r--r-- | spec/arel/unit/session/session_spec.rb (renamed from spec/active_relation/unit/session/session_spec.rb) | 2 | ||||
-rw-r--r-- | spec/spec_helper.rb | 4 |
22 files changed, 23 insertions, 23 deletions
diff --git a/spec/active_relation/unit/predicates/binary_spec.rb b/spec/arel/unit/predicates/binary_spec.rb index 56c568b078..f39b37d913 100644 --- a/spec/active_relation/unit/predicates/binary_spec.rb +++ b/spec/arel/unit/predicates/binary_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Binary do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/predicates/equality_spec.rb b/spec/arel/unit/predicates/equality_spec.rb index 5415b35925..8a58ba3096 100644 --- a/spec/active_relation/unit/predicates/equality_spec.rb +++ b/spec/arel/unit/predicates/equality_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Equality do before do @relation1 = Table.new(:users) diff --git a/spec/active_relation/unit/predicates/in_spec.rb b/spec/arel/unit/predicates/in_spec.rb index 4ca7867dd0..797798a77f 100644 --- a/spec/active_relation/unit/predicates/in_spec.rb +++ b/spec/arel/unit/predicates/in_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe In do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/primitives/attribute_spec.rb b/spec/arel/unit/primitives/attribute_spec.rb index 471ae91b5b..ac9afa85c7 100644 --- a/spec/active_relation/unit/primitives/attribute_spec.rb +++ b/spec/arel/unit/primitives/attribute_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Attribute do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/primitives/expression_spec.rb b/spec/arel/unit/primitives/expression_spec.rb index c15b073ba3..8a990231f6 100644 --- a/spec/active_relation/unit/primitives/expression_spec.rb +++ b/spec/arel/unit/primitives/expression_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Expression do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/primitives/value_spec.rb b/spec/arel/unit/primitives/value_spec.rb index ab632ef987..87425c780d 100644 --- a/spec/active_relation/unit/primitives/value_spec.rb +++ b/spec/arel/unit/primitives/value_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Value do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/relations/alias_spec.rb b/spec/arel/unit/relations/alias_spec.rb index 4a2144db82..420a91c806 100644 --- a/spec/active_relation/unit/relations/alias_spec.rb +++ b/spec/arel/unit/relations/alias_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Alias do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/relations/compound_spec.rb b/spec/arel/unit/relations/compound_spec.rb index 54a89f3f57..763e447db3 100644 --- a/spec/active_relation/unit/relations/compound_spec.rb +++ b/spec/arel/unit/relations/compound_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Compound do before do class ConcreteCompound < Compound diff --git a/spec/active_relation/unit/relations/deletion_spec.rb b/spec/arel/unit/relations/deletion_spec.rb index 08f7bc03bb..f975720d83 100644 --- a/spec/active_relation/unit/relations/deletion_spec.rb +++ b/spec/arel/unit/relations/deletion_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Deletion do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/relations/grouping_spec.rb b/spec/arel/unit/relations/grouping_spec.rb index 4b5badbb8b..bef3566896 100644 --- a/spec/active_relation/unit/relations/grouping_spec.rb +++ b/spec/arel/unit/relations/grouping_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Grouping do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/relations/insertion_spec.rb b/spec/arel/unit/relations/insertion_spec.rb index 543e2d51a9..10b70a2036 100644 --- a/spec/active_relation/unit/relations/insertion_spec.rb +++ b/spec/arel/unit/relations/insertion_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Insertion do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/relations/join_spec.rb b/spec/arel/unit/relations/join_spec.rb index c1a13cee6e..f9d0d9561e 100644 --- a/spec/active_relation/unit/relations/join_spec.rb +++ b/spec/arel/unit/relations/join_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Join do before do @relation1 = Table.new(:users) diff --git a/spec/active_relation/unit/relations/order_spec.rb b/spec/arel/unit/relations/order_spec.rb index e8a2f4c227..838a2f141e 100644 --- a/spec/active_relation/unit/relations/order_spec.rb +++ b/spec/arel/unit/relations/order_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Order do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/relations/projection_spec.rb b/spec/arel/unit/relations/projection_spec.rb index 5936cbc45f..cd59d6c383 100644 --- a/spec/active_relation/unit/relations/projection_spec.rb +++ b/spec/arel/unit/relations/projection_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Projection do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/relations/relation_spec.rb b/spec/arel/unit/relations/relation_spec.rb index c40974e136..46c3ee250d 100644 --- a/spec/active_relation/unit/relations/relation_spec.rb +++ b/spec/arel/unit/relations/relation_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Relation do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/relations/selection_spec.rb b/spec/arel/unit/relations/selection_spec.rb index d87e075f98..61d9787df2 100644 --- a/spec/active_relation/unit/relations/selection_spec.rb +++ b/spec/arel/unit/relations/selection_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Selection do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/relations/skip_spec.rb b/spec/arel/unit/relations/skip_spec.rb index 219bfdd80e..d83c969aa8 100644 --- a/spec/active_relation/unit/relations/skip_spec.rb +++ b/spec/arel/unit/relations/skip_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Skip do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/relations/table_spec.rb b/spec/arel/unit/relations/table_spec.rb index 2751d9cb63..eb765ce777 100644 --- a/spec/active_relation/unit/relations/table_spec.rb +++ b/spec/arel/unit/relations/table_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Table do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/relations/take_spec.rb b/spec/arel/unit/relations/take_spec.rb index 8c13732258..dca7806057 100644 --- a/spec/active_relation/unit/relations/take_spec.rb +++ b/spec/arel/unit/relations/take_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Take do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/relations/update_spec.rb b/spec/arel/unit/relations/update_spec.rb index 29dd4e12dd..f411781392 100644 --- a/spec/active_relation/unit/relations/update_spec.rb +++ b/spec/arel/unit/relations/update_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Update do before do @relation = Table.new(:users) diff --git a/spec/active_relation/unit/session/session_spec.rb b/spec/arel/unit/session/session_spec.rb index 5c3b668e1f..c2eb9a4555 100644 --- a/spec/active_relation/unit/session/session_spec.rb +++ b/spec/arel/unit/session/session_spec.rb @@ -1,6 +1,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') -module ActiveRelation +module Arel describe Session do before do @relation = Table.new(:users) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6180f822bd..bc117ec47d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -5,7 +5,7 @@ require 'rubygems' require 'spec' require 'pp' require 'fileutils' -require 'active_relation' +require 'arel' [:matchers, :doubles].each do |helper| Dir["#{dir}/#{helper}/*"].each { |m| require "#{dir}/#{helper}/#{File.basename(m)}" } @@ -15,6 +15,6 @@ Spec::Runner.configure do |config| config.include(BeLikeMatcher, HashTheSameAsMatcher) config.mock_with :rr config.before do - ActiveRelation::Table.engine = ActiveRelation::Engine.new(Fake::Engine.new) + Arel::Table.engine = Arel::Engine.new(Fake::Engine.new) end end
\ No newline at end of file |