Merge branch '1.7_branch'

This commit is contained in:
Reinier Balt 2009-03-01 22:18:24 +01:00
commit b0177334ca
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit b2fcae5326ff89f2ab5a5a8e5d55b41fd2787e51
Subproject commit 8cb3847448223c5f0397a98e92a93a6af656e69d

View file

@ -57,7 +57,7 @@ describe User do
it 'has many completed todos' do
User.should have_many(:completed_todos).
with_order('todos.completed_at DESC').
with_conditions('todos.state = ? and todos.completed_at is not null', 'completed').
with_conditions('todos.state = ? AND NOT(todos.completed_at IS NULL)', 'completed').
with_include(:project, :context).
with_class_name('Todo')
end