diff --git a/doc/manual b/doc/manual index b2fcae53..8cb38474 160000 --- a/doc/manual +++ b/doc/manual @@ -1 +1 @@ -Subproject commit b2fcae5326ff89f2ab5a5a8e5d55b41fd2787e51 +Subproject commit 8cb3847448223c5f0397a98e92a93a6af656e69d diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 7ca452fc..437a4938 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -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