Merge pull request #498 from vatrai/minor_cleaning
minor cleaning with new api method all
This commit is contained in:
commit
1a844650a4
@ -68,7 +68,7 @@ def test_scoped_find_combines_and_sanitizes_conditions
|
|||||||
|
|
||||||
def test_scoped_find_all
|
def test_scoped_find_all
|
||||||
Developer.send(:with_scope, :find => { :conditions => "name = 'David'" }) do
|
Developer.send(:with_scope, :find => { :conditions => "name = 'David'" }) do
|
||||||
assert_equal [developers(:david)], Developer.find(:all)
|
assert_equal [developers(:david)], Developer.all
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -235,23 +235,23 @@ def test_scoped_create_with_join_and_merge
|
|||||||
def test_immutable_scope
|
def test_immutable_scope
|
||||||
options = { :conditions => "name = 'David'" }
|
options = { :conditions => "name = 'David'" }
|
||||||
Developer.send(:with_scope, :find => options) do
|
Developer.send(:with_scope, :find => options) do
|
||||||
assert_equal %w(David), Developer.find(:all).map { |d| d.name }
|
assert_equal %w(David), Developer.all.map(&:name)
|
||||||
options[:conditions] = "name != 'David'"
|
options[:conditions] = "name != 'David'"
|
||||||
assert_equal %w(David), Developer.find(:all).map { |d| d.name }
|
assert_equal %w(David), Developer.all.map(&:name)
|
||||||
end
|
end
|
||||||
|
|
||||||
scope = { :find => { :conditions => "name = 'David'" }}
|
scope = { :find => { :conditions => "name = 'David'" }}
|
||||||
Developer.send(:with_scope, scope) do
|
Developer.send(:with_scope, scope) do
|
||||||
assert_equal %w(David), Developer.find(:all).map { |d| d.name }
|
assert_equal %w(David), Developer.all.map(&:name)
|
||||||
scope[:find][:conditions] = "name != 'David'"
|
scope[:find][:conditions] = "name != 'David'"
|
||||||
assert_equal %w(David), Developer.find(:all).map { |d| d.name }
|
assert_equal %w(David), Developer.all.map(&:name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_scoped_with_duck_typing
|
def test_scoped_with_duck_typing
|
||||||
scoping = Struct.new(:current_scope).new(:find => { :conditions => ["name = ?", 'David'] })
|
scoping = Struct.new(:current_scope).new(:find => { :conditions => ["name = ?", 'David'] })
|
||||||
Developer.send(:with_scope, scoping) do
|
Developer.send(:with_scope, scoping) do
|
||||||
assert_equal %w(David), Developer.find(:all).map { |d| d.name }
|
assert_equal %w(David), Developer.all.map(&:name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -432,7 +432,7 @@ def test_nested_scoped_find_combines_and_sanitizes_conditions
|
|||||||
def test_merged_scoped_find_combines_and_sanitizes_conditions
|
def test_merged_scoped_find_combines_and_sanitizes_conditions
|
||||||
Developer.send(:with_scope, :find => { :conditions => ["name = ?", 'David'] }) do
|
Developer.send(:with_scope, :find => { :conditions => ["name = ?", 'David'] }) do
|
||||||
Developer.send(:with_scope, :find => { :conditions => ['salary > ?', 9000] }) do
|
Developer.send(:with_scope, :find => { :conditions => ['salary > ?', 9000] }) do
|
||||||
assert_equal %w(David), Developer.find(:all).map { |d| d.name }
|
assert_equal %w(David), Developer.all.map(&:name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -487,9 +487,9 @@ def test_immutable_nested_scope
|
|||||||
options2 = { :conditions => "name = 'David'" }
|
options2 = { :conditions => "name = 'David'" }
|
||||||
Developer.send(:with_scope, :find => options1) do
|
Developer.send(:with_scope, :find => options1) do
|
||||||
Developer.send(:with_exclusive_scope, :find => options2) do
|
Developer.send(:with_exclusive_scope, :find => options2) do
|
||||||
assert_equal %w(David), Developer.find(:all).map { |d| d.name }
|
assert_equal %w(David), Developer.all.map(&:name)
|
||||||
options1[:conditions] = options2[:conditions] = nil
|
options1[:conditions] = options2[:conditions] = nil
|
||||||
assert_equal %w(David), Developer.find(:all).map { |d| d.name }
|
assert_equal %w(David), Developer.all.map(&:name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -499,9 +499,9 @@ def test_immutable_merged_scope
|
|||||||
options2 = { :conditions => "salary > 10000" }
|
options2 = { :conditions => "salary > 10000" }
|
||||||
Developer.send(:with_scope, :find => options1) do
|
Developer.send(:with_scope, :find => options1) do
|
||||||
Developer.send(:with_scope, :find => options2) do
|
Developer.send(:with_scope, :find => options2) do
|
||||||
assert_equal %w(Jamis), Developer.find(:all).map { |d| d.name }
|
assert_equal %w(Jamis), Developer.all.map(&:name)
|
||||||
options1[:conditions] = options2[:conditions] = nil
|
options1[:conditions] = options2[:conditions] = nil
|
||||||
assert_equal %w(Jamis), Developer.find(:all).map { |d| d.name }
|
assert_equal %w(Jamis), Developer.all.map(&:name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user