From 32ad530b825f4cdac51e579306548ca695471039 Mon Sep 17 00:00:00 2001
From: Nick Kallen <nkallen@nick-kallens-computer-2.local>
Date: Sun, 18 May 2008 16:11:08 -0700
Subject: rename refactor of circle
---
spec/arel/unit/predicates/binary_spec.rb | 2 +-
spec/arel/unit/primitives/expression_spec.rb | 1 -
spec/arel/unit/relations/alias_spec.rb | 9 ---------
spec/arel/unit/relations/selection_spec.rb | 9 +++------
4 files changed, 4 insertions(+), 17 deletions(-)
(limited to 'spec/arel/unit')
diff --git a/spec/arel/unit/predicates/binary_spec.rb b/spec/arel/unit/predicates/binary_spec.rb
index e5b30b787d..57b1f3a534 100644
--- a/spec/arel/unit/predicates/binary_spec.rb
+++ b/spec/arel/unit/predicates/binary_spec.rb
@@ -72,7 +72,7 @@ module Arel
describe 'when an operand is a value' do
it "manufactures an expression with unmodified values" do
ConcreteBinary.new(@attribute1, "asdf").bind(@another_relation). \
- should == ConcreteBinary.new(@attribute1.circle(@another_relation), "asdf".circle(@another_relation))
+ should == ConcreteBinary.new(@attribute1.find_correlate_in(@another_relation), "asdf".find_correlate_in(@another_relation))
end
end
end
diff --git a/spec/arel/unit/primitives/expression_spec.rb b/spec/arel/unit/primitives/expression_spec.rb
index ace439b952..8a990231f6 100644
--- a/spec/arel/unit/primitives/expression_spec.rb
+++ b/spec/arel/unit/primitives/expression_spec.rb
@@ -14,7 +14,6 @@ module Arel
describe '#bind' do
it "manufactures an attribute with a rebound relation and self as the ancestor" do
- pending
derived_relation = @relation.select(@relation[:id].eq(1))
@expression.bind(derived_relation).should == Expression.new(@attribute.bind(derived_relation), "COUNT", nil, @expression)
end
diff --git a/spec/arel/unit/relations/alias_spec.rb b/spec/arel/unit/relations/alias_spec.rb
index 85850b5e1a..96e06f48bc 100644
--- a/spec/arel/unit/relations/alias_spec.rb
+++ b/spec/arel/unit/relations/alias_spec.rb
@@ -11,15 +11,6 @@ module Arel
Alias.new(@relation).should_not == Alias.new(@relation)
(aliaz = Alias.new(@relation)).should == aliaz
end
-
- it '' do
- @relation.select(@relation[:id].eq(1)).to_sql.should be_like("
- SELECT `users`.`id`, `users`.`name`
- FROM `users`
- WHERE
- `users`.`id` = 1
- ")
- end
end
end
end
\ No newline at end of file
diff --git a/spec/arel/unit/relations/selection_spec.rb b/spec/arel/unit/relations/selection_spec.rb
index 61d9787df2..20807f952f 100644
--- a/spec/arel/unit/relations/selection_spec.rb
+++ b/spec/arel/unit/relations/selection_spec.rb
@@ -8,13 +8,10 @@ module Arel
end
describe '#initialize' do
- before do
- @another_predicate = @relation[:name].lt(2)
- end
-
it "manufactures nested selection relations if multiple predicates are provided" do
- Selection.new(@relation, @predicate, @another_predicate). \
- should == Selection.new(Selection.new(@relation, @another_predicate), @predicate)
+ another_predicate = @relation[:name].lt(2)
+ Selection.new(@relation, @predicate, another_predicate). \
+ should == Selection.new(Selection.new(@relation, another_predicate), @predicate)
end
end
--
cgit v1.2.3